cvs: php-src(PHP_5_3) /ext/standard php_crypt_r.c
| From: | Pierre-Alain Joye | Date: | Sun, 10 Aug 2008 21:34:26 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/standard php_crypt_r.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52183@lists.php.net to get a copy of this message | ||
pajoye Sun Aug 10 21:34:26 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard php_crypt_r.c
Log:
- MFH: 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.1.2.3&r2=1.1.2.4&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.3 php-src/ext/standard/php_crypt_r.c:1.1.2.4
--- php-src/ext/standard/php_crypt_r.c:1.1.2.3 Mon Jul 28 16:43:51 2008
+++ php-src/ext/standard/php_crypt_r.c Sun Aug 10 21:34:26 2008
@@ -1,4 +1,4 @@
-/* $Id: php_crypt_r.c,v 1.1.2.3 2008/07/28 16:43:51 auroraeosrose Exp $ */
+/* $Id: php_crypt_r.c,v 1.1.2.4 2008/08/10 21:34:26 pajoye Exp $ */
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
@@ -203,8 +203,8 @@
}
memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
-
-#ifdef strncpy_s
+DebugBreak();
+#if _MSC_VER >= 1500
if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN, sp, sl + 1) != 0) {
goto _destroyCtx1;
}