Made additional modifications per Lars request

Author: Lonny Kapelushnik

ext/standard/assert.c

@@ -200,15 +200,12 @@ PHP_FUNCTION(assert)
 	}
 
 	if (ASSERTG(callback)) {
-		zval *args[ description_len == 0?3:4 ];
+		zval **args = safe_emalloc( description_len == 0 ? 3 : 4, sizeof(zval **), 0);
 		zval *retval;
 		int i;
 		uint lineno = zend_get_executed_lineno(TSRMLS_C);
 		const char *filename = zend_get_executed_filename(TSRMLS_C);
-		if (description_len != 0) {
-			MAKE_STD_ZVAL(args[3]);
-			ZVAL_STRINGL(args[3], SAFE_STRING(description), description_len, 1);
-		}
+
 		MAKE_STD_ZVAL(args[0]);
 		MAKE_STD_ZVAL(args[1]);
 		MAKE_STD_ZVAL(args[2]);
@@ -227,28 +224,32 @@ PHP_FUNCTION(assert)
 				zval_ptr_dtor(&(args[i]));
 			}
 		} else {
+			MAKE_STD_ZVAL(args[3]);
+			ZVAL_STRINGL(args[3], SAFE_STRING(description), description_len, 1);
+
 			call_user_function(CG(function_table), NULL, ASSERTG(callback), retval, 4, args TSRMLS_CC);
 			for (i = 0; i <= 3; i++) {
 				zval_ptr_dtor(&(args[i]));
 			}
 		}
 
+		efree(args);
 		zval_ptr_dtor(&retval);
 	}
 
 	if (ASSERTG(warning)) {
 		if (description_len == 0) {
 			if (myeval) {
-                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Assertion \"%s\" failed", myeval);
-            } else {
-                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Assertion failed");
-            }
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Assertion \"%s\" failed", myeval);
+			} else {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Assertion failed");
+			}
 		} else {
 			if (myeval) {
-                php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s:\"%s\" failed", description, myeval);
-            } else {
-                php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s failed", description);
-            }
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s:\"%s\" failed", description, myeval);
+			} else {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s failed", description);
+			}
 		}
 	}
 

ext/standard/tests/assert/assert04.phpt

@@ -15,7 +15,7 @@ assert(1);
 
 /* Wrong parameter count in assert */
 assert_options(ASSERT_ACTIVE, 1);
-assert(2,"failure",3);
+assert(2, "failure", 3);
 
 /* Wrong parameter count in assert_options */
 assert_options(ASSERT_ACTIVE, 0, 2);

ext/standard/tests/assert/assert_error1.phpt

@@ -20,19 +20,19 @@ function handler($errno, $errstr) {
 
 //Wrong number of parameters for assert_options()
 assert_options(ASSERT_WARNING, 1);
-var_dump($rao=assert_options(ASSERT_CALLBACK,"f1",1));
+var_dump($rao = assert_options(ASSERT_CALLBACK, "f1", 1));
 
 
 //Unknown option for assert_options()
-var_dump($rao=assert_options("F1","f1"));
+var_dump($rao=assert_options("F1", "f1"));
 
 //Wrong number of parameters for  assert()
 $sa="0 != 0";
-var_dump($r2=assert($sa,"message",1));
+var_dump($r2 = assert($sa, "message", 1));
 
 
 //Catch recoverable error with handler
-var_dump($rc=assert('aa=sd+as+safsafasfaçsafçsafç'));
+var_dump($rc = assert('aa=sd+as+safsafasfaçsafçsafç'));
 --EXPECTF--
 Warning: assert_options() expects at most 2 parameters, 3 given in %s on line %d
 NULL

ext/standard/tests/assert/assert_error3.phpt

@@ -11,7 +11,7 @@ display_errors = 1
 --FILE--
 <?php
 $sa = "0 $ 0";
-var_dump($r2=assert($sa));
+var_dump($r2 = assert($sa));
 --EXPECTF--
 
 Parse error: syntax error, unexpected '$' in %s(3) : assert code on line 1