helly Thu Feb 22 23:25:36 2007 UTC
Modified files:
/php-src/main/streams memory.c
Log:
- Fix logic
http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.33&r2=1.34&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.33 php-src/main/streams/memory.c:1.34
--- php-src/main/streams/memory.c:1.33 Sat Feb 3 14:45:54 2007
+++ php-src/main/streams/memory.c Thu Feb 22 23:25:36 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: memory.c,v 1.33 2007/02/03 14:45:54 helly Exp $ */
+/* $Id: memory.c,v 1.34 2007/02/22 23:25:36 helly Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -260,14 +260,14 @@
if (newsize <= ms->fsize) {
if (newsize < ms->fpos) {
ms->fpos = newsize;
- } else {
- ms->data =
erealloc(ms->data, newsize);
-
memset(ms->data+ms->fsize, 0, newsize - ms->fsize);
- ms->fsize = newsize;
}
+ } else {
+ ms->data = erealloc(ms->data,
newsize);
+ memset(ms->data+ms->fsize, 0,
newsize - ms->fsize);
ms->fsize = newsize;
- return
PHP_STREAM_OPTION_RETURN_OK;
}
+ ms->fsize = newsize;
+ return PHP_STREAM_OPTION_RETURN_OK;
}
default:
return PHP_STREAM_OPTION_RETURN_NOTIMPL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
