auroraeosrose           Mon Jul 28 16:43:51 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard       php_crypt_r.c 
  Log:
  Secure versions of string functions don't exist for VC6
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_crypt_r.c?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/php_crypt_r.c
diff -u php-src/ext/standard/php_crypt_r.c:1.1.2.2 
php-src/ext/standard/php_crypt_r.c:1.1.2.3
--- php-src/ext/standard/php_crypt_r.c:1.1.2.2  Mon Jul 28 11:50:34 2008
+++ php-src/ext/standard/php_crypt_r.c  Mon Jul 28 16:43:51 2008
@@ -1,4 +1,4 @@
-/* $Id: php_crypt_r.c,v 1.1.2.2 2008/07/28 11:50:34 pajoye Exp $ */
+/* $Id: php_crypt_r.c,v 1.1.2.3 2008/07/28 16:43:51 auroraeosrose Exp $ */
 /*
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
@@ -204,11 +204,18 @@
 
        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 */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to