mirror of
https://github.com/php/php-src.git
synced 2025-08-16 14:08:47 +02:00
- fixed bug in hwnew_new_document_from_file
This commit is contained in:
parent
980d7a11a9
commit
47b5b8da58
1 changed files with 7 additions and 10 deletions
|
@ -2863,14 +2863,8 @@ PHP_FUNCTION(hw_new_document)
|
||||||
PHP_FUNCTION(hw_new_document_from_file)
|
PHP_FUNCTION(hw_new_document_from_file)
|
||||||
{
|
{
|
||||||
pval **arg1, **arg2;
|
pval **arg1, **arg2;
|
||||||
int len, type;
|
|
||||||
char *ptr;
|
char *ptr;
|
||||||
int issock=0;
|
|
||||||
int socketd=0;
|
|
||||||
FILE *fp;
|
|
||||||
php_stream *stream;
|
php_stream *stream;
|
||||||
int ready=0;
|
|
||||||
int bcount=0;
|
|
||||||
int use_include_path=0;
|
int use_include_path=0;
|
||||||
hw_document *doc;
|
hw_document *doc;
|
||||||
|
|
||||||
|
@ -2895,13 +2889,16 @@ PHP_FUNCTION(hw_new_document_from_file)
|
||||||
doc->size = php_stream_copy_to_mem(stream, &doc->data, PHP_STREAM_COPY_ALL, 1);
|
doc->size = php_stream_copy_to_mem(stream, &doc->data, PHP_STREAM_COPY_ALL, 1);
|
||||||
|
|
||||||
php_stream_close(stream);
|
php_stream_close(stream);
|
||||||
|
|
||||||
doc->data = realloc(doc->data, bcount+1);
|
/* I'm not sure if it is necessary to add a '\0'. It depends on whether
|
||||||
|
* PHP-Strings has to be null terminated. doc->size doesn't count the
|
||||||
|
* '\0'.
|
||||||
|
*/
|
||||||
|
doc->data = realloc(doc->data, doc->size+1);
|
||||||
ptr = doc->data;
|
ptr = doc->data;
|
||||||
ptr[bcount] = '\0';
|
ptr[doc->size] = '\0';
|
||||||
doc->attributes = strdup(Z_STRVAL_PP(arg1));
|
doc->attributes = strdup(Z_STRVAL_PP(arg1));
|
||||||
doc->bodytag = NULL;
|
doc->bodytag = NULL;
|
||||||
doc->size = bcount;
|
|
||||||
Z_LVAL_P(return_value) = zend_list_insert(doc, le_document);
|
Z_LVAL_P(return_value) = zend_list_insert(doc, le_document);
|
||||||
Z_TYPE_P(return_value) = IS_LONG;
|
Z_TYPE_P(return_value) = IS_LONG;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue