Fixed allocation size when converting from UTF-8 to UCS-2.
authorRyan C. Gordon <icculus@icculus.org>
Tue, 22 Jan 2008 04:11:27 +0000
changeset 915 1445c55cdbe6
parent 914 202a708f479b
child 916 3a0405600092
Fixed allocation size when converting from UTF-8 to UCS-2.
CHANGELOG.txt
platform/windows.c
--- a/CHANGELOG.txt	Tue Jan 22 03:46:44 2008 +0000
+++ b/CHANGELOG.txt	Tue Jan 22 04:11:27 2008 +0000
@@ -2,7 +2,8 @@
  * CHANGELOG.
  */
 
-01212008 - Fixed HTTP header in physfshttpd.c.
+01212008 - Fixed HTTP header in physfshttpd.c. Fixed utf-8 to UCS-2 allocation
+           size in Windows code.
 12112007 - Fixed incorrect directory test in Windows code (thanks, Buginator!).
 10012007 - More mingw32 fixes.
 07122007 - Maybe fixed compile on mingw32.
--- a/platform/windows.c	Tue Jan 22 03:46:44 2008 +0000
+++ b/platform/windows.c	Tue Jan 22 04:11:27 2008 +0000
@@ -47,7 +47,7 @@
     if (str == NULL) \
         w_assignto = NULL; \
     else { \
-        const PHYSFS_uint64 len = (PHYSFS_uint64) ((strlen(str) * 4) + 1); \
+        const PHYSFS_uint64 len = (PHYSFS_uint64) ((strlen(str) + 1) * 2); \
         w_assignto = (WCHAR *) __PHYSFS_smallAlloc(len); \
         if (w_assignto != NULL) \
             PHYSFS_utf8ToUcs2(str, (PHYSFS_uint16 *) w_assignto, len); \