cvs: php4(PHP_4_2_0) /ext/standard file.c
| From: | Derick Rethans | Date: | Mon, 02 Sep 2002 14:36:21 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/standard file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13778@lists.php.net to get a copy of this message | ||
derick Mon Sep 2 10:36:21 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/standard file.c
Log:
- Fix the segmentation fault when magic_quotes_runtime was disabled as
introduced in http://news.php.net/article.php?group=php.cvs&article=13690
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.205.2.4 php4/ext/standard/file.c:1.205.2.5
--- php4/ext/standard/file.c:1.205.2.4 Mon Aug 26 20:22:17 2002
+++ php4/ext/standard/file.c Mon Sep 2 10:36:20 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.205.2.4 2002/08/27 00:22:17 helly Exp $ */
+/* $Id: file.c,v 1.205.2.5 2002/09/02 14:36:20 derick Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1265,8 +1265,8 @@
socketd = *(int *) what;
}
+ buffer = estrndup(Z_STRVAL_PP(arg2), Z_STRLEN_PP(arg2));
if (!arg3 && PG(magic_quotes_runtime)) {
- buffer = estrndup(Z_STRVAL_PP(arg2), Z_STRLEN_PP(arg2));
php_stripslashes(buffer, &num_bytes TSRMLS_CC);
}