From 826ca288e752d12f893d198d48a3c50aa873f18b Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Mon, 2 Nov 2009 20:46:52 +0000 Subject: - Fixed #50052, Different Hashes on Windows and Linux on wrong Salt size --- ext/standard/php_crypt_r.c | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/standard/php_crypt_r.c') diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c index e0465fdb59..4307f4c903 100644 --- a/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c @@ -208,6 +208,7 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out) { if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN, sp, sl + 1) != 0) { goto _destroyCtx1; } + passwd[MD5_MAGIC_LEN + sl] = '\0'; strcat_s(passwd, MD5_HASH_MAX_LEN, "$"); #else /* VC6 version doesn't have strcat_s or strncpy_s */ -- cgit v1.2.1