From: Antony Dovgal Date: Sun, 15 Jan 2006 22:01:47 +0000 (+0000) Subject: fix bug #36017 (fopen() crashes PHP when opening a URL) X-Git-Tag: php-4.4.3RC1~71 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6ebb49ea539d778791eeb509a9564f30cc5a215;p=php fix bug #36017 (fopen() crashes PHP when opening a URL) + fix incosistency in macro usage --- diff --git a/NEWS b/NEWS index 6660da72cf..fe5d34adf9 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,8 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2006, Version 4.4.3 - Added a check for special characters in the session name. (Ilia) - +- Fixed bug #36017 (fopen() crashes PHP when opening a URL). (Tony) + 13 Jan 2006, Version 4.4.2 - Added missing safe_mode/open_basedir checks into cURL extension. (Ilia) - Backported missing imap_mailcompose() fixes from PHP 5.x. (Ilia) diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index da46645721..30436777db 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -339,7 +339,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, size_t tmp_line_len; /* get response header */ - if (_php_stream_get_line(stream, tmp_line, sizeof(tmp_line) - 1, &tmp_line_len TSRMLS_CC) != NULL) { + if (php_stream_get_line(stream, tmp_line, sizeof(tmp_line) - 1, &tmp_line_len) != NULL) { zval *http_response; int response_code; @@ -394,7 +394,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, while (!body && !php_stream_eof(stream)) { size_t http_header_line_length; - if (php_stream_get_line(stream, http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length TSRMLS_CC) && *http_header_line != '\n' && *http_header_line != '\r') { + if (php_stream_get_line(stream, http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length) && *http_header_line != '\n' && *http_header_line != '\r') { char *e = http_header_line + http_header_line_length - 1; while (*e == '\n' || *e == '\r') { e--;