Make read always 0-terminate strings

diff --git a/ext/standard/file.c b/ext/standard/file.c
index dd5c675615dd3f98203d5a101156bc40a93e121a..3261e0642580e0d24dffea00deb1158423590b43 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2041,10 +2041,10 @@ PHP_FUNCTION(fread)
                }
 #endif
                return_value->value.str.len = fread(return_value->value.str.val, 1, len, (FILE*)what);
-               return_value->value.str.val[return_value->value.str.len] = 0;
        } else {
                return_value->value.str.len = SOCK_FREAD(return_value->value.str.val, len, socketd);
        }
+       return_value->value.str.val[return_value->value.str.len] = 0;
        if (PG(magic_quotes_runtime)) {
                return_value->value.str.val = php_addslashes(return_value->value.str.val,return_value->value.str.len,&return_value->value.str.len,1);
        }