pajoye          Sun Aug 10 21:34:02 2008 UTC

  Modified files:              
    /php-src/ext/standard       php_crypt_r.c 
  Log:
  - fix the VC6 fix or strncpy_s (md5 crypt failed with VC9 as it used strncpy 
wrongly)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_crypt_r.c?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/php_crypt_r.c
diff -u php-src/ext/standard/php_crypt_r.c:1.2 
php-src/ext/standard/php_crypt_r.c:1.3
--- php-src/ext/standard/php_crypt_r.c:1.2      Mon Jul 28 16:48:38 2008
+++ php-src/ext/standard/php_crypt_r.c  Sun Aug 10 21:34:02 2008
@@ -1,4 +1,4 @@
-/* $Id: php_crypt_r.c,v 1.2 2008/07/28 16:48:38 auroraeosrose Exp $ */
+/* $Id: php_crypt_r.c,v 1.3 2008/08/10 21:34:02 pajoye Exp $ */
 /*
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
@@ -204,7 +204,7 @@
 
        memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
 
-#ifdef strncpy_s
+#if _MSC_VER >= 1500
        if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN, 
sp, sl + 1) != 0) {
                goto _destroyCtx1;
        }



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

Reply via email to