From: Thies C. Arntzen <thies@php.net>
Date: Wed, 6 Sep 2000 13:50:09 +0000 (+0000)
Subject: fix #6552 & #6577
X-Git-Tag: php-4.0.3RC1~276
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=573fe4346da39fe7000eeb0d1784ba7c694e4187;p=php

fix #6552 & #6577
thanx to Blake Schwendiman" <blake@intechra.net>
---

diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index a7e94b404b..facd41548f 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -301,12 +301,12 @@ PHP_FUNCTION(assert_options)
 		RETVAL_STRING(SAFE_STRING(oldstr),1);
 
 		if (ac == 2) {
+			if (oldstr) {
+				efree(oldstr);
+			} 
 			convert_to_string_ex(value);
 			ASSERT(callback) = estrndup((*value)->value.str.val,(*value)->value.str.len);
 		}
-		if (oldstr) {
-			efree(oldstr);
-		} 
 		return;
 		break;