From: Anatol Belski <ab@php.net>
Date: Tue, 18 Nov 2014 11:34:45 +0000 (+0100)
Subject: return after the warning, to fix uninitialized salt usage
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~46^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8f86a44ef108e7fcd7e8bc810e7c8ee3dd684a2;p=php

return after the warning, to fix uninitialized salt usage
---

diff --git a/ext/standard/password.c b/ext/standard/password.c
index cd2170b036..4f211dd35f 100644
--- a/ext/standard/password.c
+++ b/ext/standard/password.c
@@ -384,6 +384,7 @@ PHP_FUNCTION(password_hash)
 			efree(hash_format);
 			efree(buffer);
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Supplied salt is too long");
+			RETURN_NULL();
 		} else if (buffer_len < required_salt_len) {
 			efree(hash_format);
 			efree(buffer);