cvs: php4 /ext/standard scanf.c
| From: | Stanislav Malyshev | Date: | Mon, 30 Oct 2000 16:44:01 +0000 |
| Subject: | cvs: php4 /ext/standard scanf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2358@lists.php.net to get a copy of this message | ||
stas Mon Oct 30 08:44:01 2000 EDT
Modified files:
/php4/ext/standard scanf.c
Log:
Fix crash in sscanf in error handler (#7533)
Index: php4/ext/standard/scanf.c
diff -u php4/ext/standard/scanf.c:1.3 php4/ext/standard/scanf.c:1.4
--- php4/ext/standard/scanf.c:1.3 Sun Jul 23 18:39:49 2000
+++ php4/ext/standard/scanf.c Mon Oct 30 08:44:01 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: scanf.c,v 1.3 2000/07/24 01:39:49 david Exp $ */
+/* $Id: scanf.c,v 1.4 2000/10/30 16:44:01 stas Exp $ */
/*
scanf.c --
@@ -1235,7 +1235,8 @@
(*return_value)->type = IS_LONG;
(*return_value)->value.lval = SCAN_ERROR_EOF; /* EOF marker */
} else {
- pval_destructor( *return_value );
+ /* pval_destructor( *return_value ); */
+ /* convert_to_null calls destructor */
convert_to_null( *return_value );
}
}