From a863c128be6cbb21c2653cf2951ebbaaed7e3835 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Tue, 22 Jan 2008 04:11:27 +0000 Subject: [PATCH] Fixed allocation size when converting from UTF-8 to UCS-2. --- CHANGELOG.txt | 3 ++- platform/windows.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 16639aeb..d83f726c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -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. diff --git a/platform/windows.c b/platform/windows.c index 40577625..eb756d54 100644 --- a/platform/windows.c +++ b/platform/windows.c @@ -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); \