cvs: php4 /ext/standard assert.c
| From: | Zeev Suraski | Date: | Tue, 31 Jul 2001 02:59:45 +0000 |
| Subject: | cvs: php4 /ext/standard assert.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6433@lists.php.net to get a copy of this message | ||
zeev Mon Jul 30 22:59:45 2001 EDT
Modified files:
/php4/ext/standard assert.c
Log:
Fix a crash bug in assert
Index: php4/ext/standard/assert.c
diff -u php4/ext/standard/assert.c:1.40 php4/ext/standard/assert.c:1.41
--- php4/ext/standard/assert.c:1.40 Mon Jul 30 04:24:35 2001
+++ php4/ext/standard/assert.c Mon Jul 30 22:59:44 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.40 2001/07/30 08:24:35 zeev Exp $ */
+/* $Id: assert.c,v 1.41 2001/07/31 02:59:44 zeev Exp $ */
/* {{{ includes/startup/misc */
@@ -54,14 +54,15 @@
{
if (ASSERTG(callback)) {
zval_ptr_dtor(&ASSERTG(callback));
- } else {
- MAKE_STD_ZVAL(ASSERTG(callback));
}
- if (new_value)
- ZVAL_STRINGL(ASSERTG(callback),new_value,new_value_length,1)
- else
- ZVAL_EMPTY_STRING(ASSERTG(callback))
+ MAKE_STD_ZVAL(ASSERTG(callback));
+
+ if (new_value) {
+ ZVAL_STRINGL(ASSERTG(callback),new_value,new_value_length,1);
+ } else {
+ ZVAL_EMPTY_STRING(ASSERTG(callback));
+ }
return SUCCESS;
}