]> granicus.if.org Git - php/commitdiff
return after the warning, to fix uninitialized salt usage
authorAnatol Belski <ab@php.net>
Tue, 18 Nov 2014 11:34:45 +0000 (12:34 +0100)
committerAnatol Belski <ab@php.net>
Tue, 18 Nov 2014 12:19:52 +0000 (13:19 +0100)
ext/standard/password.c

index cd2170b036ac1e641f15853e702f8f8bb0524066..4f211dd35f34bf214bafb02f2516241f1e7f3a6e 100644 (file)
@@ -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);