com php-src: Apply error-code-salt fix to Windows too: ext/standard/crypt.c
| From: | Stanislav Malyshev | Date: | Tue, 07 Oct 2014 12:12:38 +0000 |
| Subject: | com php-src: Apply error-code-salt fix to Windows too: ext/standard/crypt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83426@lists.php.net to get a copy of this message | ||
Commit: f66013df94f9555f73aea4dd48aee668701f87d9
Author: Leigh <leight@gmail.com> Tue, 7 Oct 2014 13:12:38 +0100
Parents: 4e8c8761206f595691eaeee8a179fa9be286dcf3
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f66013df94f9555f73aea4dd48aee668701f87d9
Log:
Apply error-code-salt fix to Windows too
Changed paths:
M ext/standard/crypt.c
Diff:
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index f992042..40b9e6d 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -239,7 +239,7 @@ PHPAPI int php_crypt(const char *password, const int pass_len, const char *salt,
# error Data struct used by crypt_r() is unknown. Please report.
# endif
crypt_res = crypt_r(password, salt, &buffer);
- if (!crypt_res) {
+ if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
return FAILURE;
} else {
*result = estrdup(crypt_res);