- WS

diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c
index ce83b4d070a7234fe109fce5e125d35d3d28aaa1..67afc2f0f0ae15c239aa5afa31128e32214a7142 100644 (file)
--- 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) {