From: Pierre Joye <pajoye@php.net>
Date: Mon, 9 Oct 2006 00:06:41 +0000 (+0000)
Subject: - MFB: fix possible segfault (see test 004) always exists and returns NULL
X-Git-Tag: RELEASE_1_0_0RC1~1344
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b16d1861a617034e0a912cd5c712d19aa5435f1e;p=php

- MFB: fix possible segfault (see test 004) always exists and returns NULL
  on error (thx Bjori for the head up)
---

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index e244e304d5..da626a915d 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1801,8 +1801,8 @@ static EVP_PKEY * php_openssl_evp_from_zval(zval ** val, int public_key, char *
 #define TMP_CLEAN \
 	if (Z_TYPE(tmp) == IS_STRING) {\
 		zval_dtor(&tmp); \
-		return NULL; \
-	}
+	} \
+	return NULL;
 
 	if (resourceval) {
 		*resourceval = -1;