pajoye Mon, 02 Nov 2009 23:02:16 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=290155
Log: - WS Changed paths: U php/php-src/trunk/ext/standard/php_crypt_r.c Modified: php/php-src/trunk/ext/standard/php_crypt_r.c =================================================================== --- php/php-src/trunk/ext/standard/php_crypt_r.c 2009-11-02 20:46:52 UTC (rev 290154) +++ php/php-src/trunk/ext/standard/php_crypt_r.c 2009-11-02 23:02:16 UTC (rev 290155) @@ -205,11 +205,11 @@ memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN); #if _MSC_VER >= 1500 - if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN, sp, sl + 1) != 0) { - goto _destroyCtx1; - } + 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, "$"); + strcat_s(passwd, MD5_HASH_MAX_LEN, "$"); #else /* VC6 version doesn't have strcat_s or strncpy_s */ if (strncpy(passwd + MD5_MAGIC_LEN, sp, sl + 1) < sl) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php