From dc0e20919bb51d1abd4f4e3871c58a92d22de79e Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Mon, 2 Nov 2009 23:02:16 +0000 Subject: [PATCH] - WS --- ext/standard/php_crypt_r.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c index ce83b4d070..67afc2f0f0 100644 --- a/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c @@ -205,11 +205,11 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out) { 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) { -- 2.50.1