From: Nuno Lopes <nlopess@php.net>
Date: Thu, 9 Nov 2006 16:34:00 +0000 (+0000)
Subject: MFB: fix possible segfault
X-Git-Tag: RELEASE_1_0_0RC1~1091
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=667f469349b09a5232311c4429bac552ce974d8b;p=php

MFB: fix possible segfault
---

diff --git a/ext/filter/callback_filter.c b/ext/filter/callback_filter.c
index a825a5dc38..fd8ed2d4cd 100644
--- a/ext/filter/callback_filter.c
+++ b/ext/filter/callback_filter.c
@@ -42,15 +42,14 @@ void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
 		if (retval_ptr != value) {
 			zval_dtor(value);
 			COPY_PZVAL_TO_ZVAL(*value, retval_ptr);
+		} else {
+			zval_ptr_dtor(&retval_ptr);
 		}
 	} else {
 		zval_dtor(value);
 		Z_TYPE_P(value) = IS_NULL;
 	}
 
-	if (retval_ptr) {
-		zval_ptr_dtor(&retval_ptr);
-	}
 	efree(args);
 }