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

- fix possible segfault (see test 004) always exists and returns NULL on
  error
---

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 4fca466b67..01cec4baa4 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1890,8 +1890,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;