svn: /php/php-src/branches/PHP_5_3_8/ ext/standard/php_crypt_r.c
| From: | Johannes Schlüter | Date: | Tue, 23 Aug 2011 08:09:55 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3_8/ ext/standard/php_crypt_r.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65950@lists.php.net to get a copy of this message | ||
johannes Tue, 23 Aug 2011 08:09:55 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315338
Log:
Merge r315218 - Unbreak crypt() (fix bug #55439) (stas)
Bug: https://bugs.php.net/55439 (Closed) crypt() returns
only the salt for MD5
Changed paths:
_U php/php-src/branches/PHP_5_3_8/
U php/php-src/branches/PHP_5_3_8/ext/standard/php_crypt_r.c
Property changes on: php/php-src/branches/PHP_5_3_8
___________________________________________________________________
Modified: svn:mergeinfo
- /php/php-src/trunk:284726,305015,305018-305019
+ /php/php-src/branches/PHP_5_3:315218
/php/php-src/trunk:284726,305015,305018-305019
Modified: php/php-src/branches/PHP_5_3_8/ext/standard/php_crypt_r.c
===================================================================
--- php/php-src/branches/PHP_5_3_8/ext/standard/php_crypt_r.c 2011-08-23 08:02:38 UTC (rev 315337)
+++ php/php-src/branches/PHP_5_3_8/ext/standard/php_crypt_r.c 2011-08-23 08:09:55 UTC (rev 315338)
@@ -382,7 +382,7 @@
/* Now make the output string */
memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1);
- strlcat(passwd, "$", 1);
+ strcat(passwd, "$");
PHP_MD5Final(final, &ctx);