cvs: php4 /ext/standard file.c
| From: | Stanislav Malyshev | Date: | Mon, 16 Jul 2001 15:44:36 +0000 |
| Subject: | cvs: php4 /ext/standard file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6244@lists.php.net to get a copy of this message | ||
stas Mon Jul 16 11:44:36 2001 EDT
Modified files:
/php4/ext/standard file.c
Log:
Make read always 0-terminate strings
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.167 php4/ext/standard/file.c:1.168
--- php4/ext/standard/file.c:1.167 Sun Jul 15 15:03:03 2001
+++ php4/ext/standard/file.c Mon Jul 16 11:44:36 2001
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.167 2001/07/15 19:03:03 zeev Exp $ */
+/* $Id: file.c,v 1.168 2001/07/16 15:44:36 stas Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2041,10 +2041,10 @@
}
#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);
}