stas Wed Feb 21 01:13:44 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/com_dotnet com_olechar.c
Log:
Cosmetic fix - safe_emalloc(nmemb, size, offset)
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_olechar.c?r1=1.5.2.1.2.2&r2=1.5.2.1.2.3&diff_format=u
Index: php-src/ext/com_dotnet/com_olechar.c
diff -u php-src/ext/com_dotnet/com_olechar.c:1.5.2.1.2.2
php-src/ext/com_dotnet/com_olechar.c:1.5.2.1.2.3
--- php-src/ext/com_dotnet/com_olechar.c:1.5.2.1.2.2 Mon Feb 19 17:29:19 2007
+++ php-src/ext/com_dotnet/com_olechar.c Wed Feb 21 01:13:44 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_olechar.c,v 1.5.2.1.2.2 2007/02/19 17:29:19 dmitry Exp $ */
+/* $Id: com_olechar.c,v 1.5.2.1.2.3 2007/02/21 01:13:44 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -45,7 +45,7 @@
}
if (string_len > 0) {
- olestring = (OLECHAR*)safe_emalloc(sizeof(OLECHAR), string_len,
0);
+ olestring = (OLECHAR*)safe_emalloc(string_len, sizeof(OLECHAR),
0);
ok = MultiByteToWideChar(codepage, flags, string, string_len,
olestring, string_len);
} else {
ok = FALSE;
@@ -75,7 +75,7 @@
length = WideCharToMultiByte(codepage, 0, olestring, -1, NULL, 0, NULL,
NULL);
if (length) {
- string = (char*)safe_emalloc(sizeof(char), length, 0);
+ string = (char*)safe_emalloc(length, sizeof(char), 0);
length = WideCharToMultiByte(codepage, 0, olestring, -1,
string, length, NULL, NULL);
ok = length > 0;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
