diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-11-15 14:46:34 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-11-15 14:46:34 +0000 |
| commit | c4da6009bb1611851f85e9c9ff546c5b1a8a8104 (patch) | |
| tree | fbfb69568ee36d3a5f944b0261228fd1043c65eb | |
| parent | d3e0b57e1a8f8e130b21cd3fb17c58065107e561 (diff) | |
| download | php-git-c4da6009bb1611851f85e9c9ff546c5b1a8a8104.tar.gz | |
MFH: Fixed possible crash in http:// wrapper.
| -rw-r--r-- | ext/standard/http_fopen_wrapper.c | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index 0b79c1606f..96ba403494 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -460,12 +460,11 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, location[0] = '\0'; - if (!header_init && FAILURE == zend_hash_find(EG(active_symbol_table), - "http_response_header", sizeof("http_response_header"), (void **) &response_header)) { - header_init = 1; - } - - if (header_init) { + if (!header_init) { + MAKE_STD_ZVAL(stream->wrapperdata); + array_init(stream->wrapperdata); + response_header = &stream->wrapperdata; + } else { zval *tmp; MAKE_STD_ZVAL(tmp); array_init(tmp); @@ -475,7 +474,6 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, "http_response_header", sizeof("http_response_header"), (void **) &response_header); } - if (!php_stream_eof(stream)) { size_t tmp_line_len; /* get response header */ @@ -484,9 +482,6 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, zval *http_response; int response_code; - MAKE_STD_ZVAL(http_response); - ZVAL_NULL(http_response); - if (tmp_line_len > 9) { response_code = atoi(tmp_line + 9); } else { @@ -511,18 +506,14 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, php_stream_notify_error(context, PHP_STREAM_NOTIFY_FAILURE, tmp_line, response_code); } - - Z_STRLEN_P(http_response) = tmp_line_len; - Z_STRVAL_P(http_response) = estrndup(tmp_line, Z_STRLEN_P(http_response)); - if (Z_STRVAL_P(http_response)[Z_STRLEN_P(http_response)-1]=='\n') { - Z_STRVAL_P(http_response)[Z_STRLEN_P(http_response)-1]=0; - Z_STRLEN_P(http_response)--; - if (Z_STRVAL_P(http_response)[Z_STRLEN_P(http_response)-1]=='\r') { - Z_STRVAL_P(http_response)[Z_STRLEN_P(http_response)-1]=0; - Z_STRLEN_P(http_response)--; + if (tmp_line[tmp_line_len - 1] == '\n') { + --tmp_line_len; + if (tmp_line[tmp_line_len - 1] == '\r') { + --tmp_line_len; } } - Z_TYPE_P(http_response) = IS_STRING; + MAKE_STD_ZVAL(http_response); + ZVAL_STRINGL(http_response, tmp_line, tmp_line_len, 1); zend_hash_next_index_insert(Z_ARRVAL_PP(response_header), &http_response, sizeof(zval *), NULL); } } else { @@ -661,7 +652,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, CHECK_FOR_CNTRL_CHARS(resource->path) stream = php_stream_url_wrap_http_ex(wrapper, new_path, mode, options, opened_path, context, --redirect_max, 0 STREAMS_CC TSRMLS_CC); - if (stream && stream->wrapperdata) { + if (stream && stream->wrapperdata && *response_header != stream->wrapperdata) { entryp = &entry; MAKE_STD_ZVAL(entry); ZVAL_EMPTY_STRING(entry); |