cvs: php-src(PHP_5_1) /main/streams memory.c
| From: | Marcus Boerger | Date: | Sat, 18 Mar 2006 19:57:00 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /main/streams memory.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-37334@lists.php.net to get a copy of this message | ||
helly Sat Mar 18 19:57:00 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/main/streams memory.c
Log:
- MFH Fix seek/eof issue in temp streams
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/memory.c?r1=1.8.2.5&r2=1.8.2.6&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.8.2.5 php-src/main/streams/memory.c:1.8.2.6
--- php-src/main/streams/memory.c:1.8.2.5 Thu Jan 5 22:03:07 2006
+++ php-src/main/streams/memory.c Sat Mar 18 19:57:00 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: memory.c,v 1.8.2.5 2006/01/05 22:03:07 helly Exp $ */
+/* $Id: memory.c,v 1.8.2.6 2006/03/18 19:57:00 helly Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -159,7 +159,7 @@
return 0;
}
} else {
- if (ms->fpos < (size_t)(offset)) {
+ if (ms->fpos + (size_t)(offset) > ms->fsize) {
ms->fpos = ms->fsize;
*newoffs = -1;
return -1;