iliaa Wed Dec 7 21:53:09 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/standard http_fopen_wrapper.c
Log:
Fixed bug #34359 (Possible crash inside fopen http wrapper).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.278&r2=1.2027.2.279&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.278 php-src/NEWS:1.2027.2.279
--- php-src/NEWS:1.2027.2.278 Tue Dec 6 18:32:04 2005
+++ php-src/NEWS Wed Dec 7 21:53:06 2005
@@ -61,6 +61,7 @@
(Nuno, Ilia)
- Fixed bug #35028 (SimpleXML object fails FALSE test). (Marcus)
- Fixed bug #34729 (Crash in ZTS mode under Apache). (Dmitry, Zeev)
+- Fixed bug #34359 (Possible crash inside fopen http wrapper). (Ilia,Sara,Nuno)
- Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if
display_startup_error is off). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.4&r2=1.99.2.5&ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.4
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.5
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.4 Tue Dec 6 14:15:41 2005
+++ php-src/ext/standard/http_fopen_wrapper.c Wed Dec 7 21:53:08 2005
@@ -19,7 +19,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.99.2.4 2005/12/06 19:15:41 pollita Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.99.2.5 2005/12/08 02:53:08 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -526,28 +526,16 @@
http_header_line = emalloc(HTTP_HEADER_BLOCK_SIZE);
- while (!body && !php_stream_eof(stream)) {
-
- if (php_stream_gets(stream, http_header_line,
HTTP_HEADER_BLOCK_SIZE-1) != NULL) {
- char *p;
- int found_eol = 0;
- int http_header_line_length;
-
- http_header_line[HTTP_HEADER_BLOCK_SIZE-1] = '\0';
-
- p = http_header_line;
- while(*p) {
- while(*p == '\n' || *p == '\r') {
- *p = '\0';
- p--;
- found_eol = 1;
- }
- if (found_eol)
- break;
- p++;
+ 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') {
+ char *e = http_header_line + http_header_line_length -
1;
+ while (*e == '\n' || *e == '\r') {
+ e--;
}
- http_header_line_length = p-http_header_line+1;
-
+ http_header_line_length = e - http_header_line + 1;
+ http_header_line[http_header_line_length] = '\0';
+
if (!strncasecmp(http_header_line, "Location: ", 10)) {
strlcpy(location, http_header_line + 10,
sizeof(location));
} else if (!strncasecmp(http_header_line,
"Content-Type: ", 14)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
