cvs: php-src(PHP_4_4) /ext/standard php_fopen_wrapper.c
| From: | Sara Golemon | Date: | Thu, 17 Nov 2005 19:41:02 +0000 |
| Subject: | cvs: php-src(PHP_4_4) /ext/standard php_fopen_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-35178@lists.php.net to get a copy of this message | ||
pollita Thu Nov 17 14:41:02 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard php_fopen_wrapper.c
Log:
MFH (r-1.51) #32371 php://input sometimes returns duplicate data
http://cvs.php.net/diff.php/php-src/ext/standard/php_fopen_wrapper.c?r1=1.29.2.4&r2=1.29.2.4.8.1&ty=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.29.2.4
php-src/ext/standard/php_fopen_wrapper.c:1.29.2.4.8.1
--- php-src/ext/standard/php_fopen_wrapper.c:1.29.2.4 Tue May 13 19:51:57 2003
+++ php-src/ext/standard/php_fopen_wrapper.c Thu Nov 17 14:41:02 2005
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <hholzgra@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_fopen_wrapper.c,v 1.29.2.4 2003/05/13 23:51:57 sas Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.29.2.4.8.1 2005/11/17 19:41:02 pollita Exp $ */
#include <stdio.h>
#include <stdlib.h>
@@ -73,17 +73,19 @@
static size_t php_stream_input_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
{
+ off_t *position = (off_t*)stream->position;
size_t read_bytes = 0;
+
if(!stream->eof) {
if(SG(request_info).raw_post_data) { /* data has already been read by a post handler */
- read_bytes = SG(request_info).raw_post_data_length - stream->position;
+ read_bytes = SG(request_info).raw_post_data_length - *position;
if(read_bytes <= count) {
stream->eof = 1;
} else {
read_bytes = count;
}
if(read_bytes) {
- memcpy(buf, SG(request_info).raw_post_data + stream->position, read_bytes);
+ memcpy(buf, SG(request_info).raw_post_data + *position, read_bytes);
}
} else if(sapi_module.read_post) {
read_bytes = sapi_module.read_post(buf, count TSRMLS_CC);
@@ -95,12 +97,16 @@
stream->eof = 1;
}
}
+
+ *position += read_bytes;
SG(read_post_bytes) += read_bytes;
return read_bytes;
}
static int php_stream_input_close(php_stream *stream, int close_handle TSRMLS_DC)
{
+ efree(stream->abstract);
+
return 0;
}
@@ -134,7 +140,7 @@
}
if (!strcasecmp(path, "input")) {
- return php_stream_alloc(&php_stream_input_ops, NULL, 0, "rb");
+ return php_stream_alloc(&php_stream_input_ops, ecalloc(1, sizeof(off_t)), 0, "rb");
}
if (!strcasecmp(path, "stdin")) {