From: Elizabeth Marie Smith <auroraeosrose@php.net>
Date: Mon, 28 Jul 2008 16:43:51 +0000 (+0000)
Subject: Secure versions of string functions don't exist for VC6
X-Git-Tag: php-5.3.0alpha1~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49aa0feaae87434c2dee0979f30ca1d0496ae989;p=php

Secure versions of string functions don't exist for VC6
---

diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c
index 6efce8b8f3..fffd96a048 100644
--- a/ext/standard/php_crypt_r.c
+++ b/ext/standard/php_crypt_r.c
@@ -204,11 +204,18 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out) {
 
 	memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
 
+#ifdef strncpy_s
 	if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN, sp, sl + 1) != 0) {
 		goto _destroyCtx1;
 	}
 	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) != 0) {
+		goto _destroyCtx1;
+	}
+	strcat(passwd, "$");
+#endif
 	dwHashLen = 16;
 
 	/* Fetch the ctx hash value */