com php-src: return after the warning, to fix uninitialized salt usage: ext/standard/password.c
| From: | Anatol Belski | Date: | Tue, 18 Nov 2014 12:19:52 +0000 |
| Subject: | com php-src: return after the warning, to fix uninitialized salt usage: ext/standard/password.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83136@lists.php.net to get a copy of this message | ||
Commit: f8f86a44ef108e7fcd7e8bc810e7c8ee3dd684a2
Author: Anatol Belski <ab@php.net> Tue, 18 Nov 2014 12:34:45 +0100
Parents: 7e8e7ff634ade8d58711b9cbb28f9180c534ab77
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f8f86a44ef108e7fcd7e8bc810e7c8ee3dd684a2
Log:
return after the warning, to fix uninitialized salt usage
Changed paths:
M ext/standard/password.c
Diff:
diff --git a/ext/standard/password.c b/ext/standard/password.c
index cd2170b..4f211dd 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);