iliaa Wed Dec 7 21:53:34 2005 EDT
Modified files:
/php-src/ext/standard http_fopen_wrapper.c
Log:
MFB51: Fixed bug #34359 (Possible crash inside fopen http wrapper).
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.104&r2=1.105&ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.104
php-src/ext/standard/http_fopen_wrapper.c:1.105
--- php-src/ext/standard/http_fopen_wrapper.c:1.104 Tue Dec 6 14:13:27 2005
+++ php-src/ext/standard/http_fopen_wrapper.c Wed Dec 7 21:53:34 2005
@@ -19,7 +19,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.104 2005/12/06 19:13:27 pollita Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.105 2005/12/08 02:53:34 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
