cvs: php-src(PHP_5_2) /ext/mhash mhash.c
| From: | Antony Dovgal | Date: | Mon, 25 Dec 2006 21:08:02 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/mhash mhash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42384@lists.php.net to get a copy of this message | ||
tony2001 Mon Dec 25 21:08:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mhash mhash.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/mhash/mhash.c?r1=1.48.2.3.2.1&r2=1.48.2.3.2.2&diff_format=u
Index: php-src/ext/mhash/mhash.c
diff -u php-src/ext/mhash/mhash.c:1.48.2.3.2.1 php-src/ext/mhash/mhash.c:1.48.2.3.2.2
--- php-src/ext/mhash/mhash.c:1.48.2.3.2.1 Fri Nov 3 14:46:48 2006
+++ php-src/ext/mhash/mhash.c Mon Dec 25 21:08:02 2006
@@ -16,7 +16,7 @@
| Nikos Mavroyanopoulos <nmav@hellug.gr> (HMAC, KEYGEN) |
+----------------------------------------------------------------------+
*/
-/* $Id: mhash.c,v 1.48.2.3.2.1 2006/11/03 14:46:48 bjori Exp $ */
+/* $Id: mhash.c,v 1.48.2.3.2.2 2006/12/25 21:08:02 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -229,7 +229,7 @@
keystruct.salt = salt;
keystruct.salt_size = salt_len;
- ret = emalloc(bytes + 1);
+ ret = safe_emalloc(1, bytes, 1);
if (mhash_keygen_ext(KEYGEN_S2K_SALTED, keystruct, ret, bytes, password, password_len) >= 0) {
ret[bytes] = '\0';