]> granicus.if.org Git - php/commitdiff
- cleanup, no vc6 support in trunk
authorPierre Joye <pajoye@php.net>
Tue, 15 Jun 2010 13:50:14 +0000 (13:50 +0000)
committerPierre Joye <pajoye@php.net>
Tue, 15 Jun 2010 13:50:14 +0000 (13:50 +0000)
ext/standard/php_crypt_r.c

index 2fee5feb0ff9e5e07be7d4408db34dad1ba13f94..af9bf4a1b52054a41fbfa3554efa5c08f71fb0e7 100644 (file)
@@ -218,9 +218,7 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out) {
        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) {
-               goto _destroyCtx1;
-       }
+       strncpy(passwd + MD5_MAGIC_LEN, sp, sl + 1);
        strcat(passwd, "$");
 #endif
        dwHashLen = 16;