summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2007-02-22 23:26:03 +0000
committerMarcus Boerger <helly@php.net>2007-02-22 23:26:03 +0000
commite3d786be4e5d75aca1821955831209fd46dbe6eb (patch)
treebb9596a54020a203eab19e9e9343b26146fcce43
parentd94e388d74b102cb85fed4b0e99c2ffeca2d7eb9 (diff)
downloadphp-git-e3d786be4e5d75aca1821955831209fd46dbe6eb.tar.gz
- MFH Fix logic
-rw-r--r--main/streams/memory.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/main/streams/memory.c b/main/streams/memory.c
index b5e434c4c7..e0b3f88990 100644
--- a/main/streams/memory.c
+++ b/main/streams/memory.c
@@ -260,14 +260,14 @@ static int php_stream_memory_set_option(php_stream *stream, int option, int valu
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;