svn: /php/php-src/trunk/ext/standard/ crypt.c
| From: | Stanislav Malyshev | Date: | Mon, 12 Sep 2011 17:50:42 +0000 |
| Subject: | svn: /php/php-src/trunk/ext/standard/ crypt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-66472@lists.php.net to get a copy of this message | ||
stas Mon, 12 Sep 2011 17:50:42 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316564
Log:
MFB crypt fix
Changed paths:
U php/php-src/trunk/ext/standard/crypt.c
Modified: php/php-src/trunk/ext/standard/crypt.c
===================================================================
--- php/php-src/trunk/ext/standard/crypt.c 2011-09-12 17:42:23 UTC (rev 316563)
+++ php/php-src/trunk/ext/standard/crypt.c 2011-09-12 17:50:42 UTC (rev 316564)
@@ -179,6 +179,8 @@
salt[2] = '\0';
#endif
salt_in_len = strlen(salt);
+ } else {
+ salt_in_len = MIN(PHP_MAX_SALT_LEN, salt_in_len);
}
/* Windows (win32/crypt) has a stripped down version of libxcrypt and