AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-597 Use the right buffer size when converting the path name.

Browse Source 
X-SVN-Rev: 4493
This commit is contained in:
George Rhoten 2001-04-18 00:26:56 +00:00
parent b25d6d6929
commit 446cf8c769
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
icu4c/source/common/uresbund.c
View File

@ -1013,19 +1013,18 @@ U_CAPI UResourceBundle* ures_openW(const wchar_t* myPath,
const char* localeID, const char* localeID,
UErrorCode* status) UErrorCode* status)
{ {
char path[100];
UResourceBundle *r; UResourceBundle *r;
size_t tempSize = uprv_wcstombs(NULL, myPath, ((size_t)-1) >> 1); size_t pathSize = (uprv_wcslen(myPath) + 1) * sizeof(int32_t);
/*char *temp = new char[tempSize + 1];*/ char *path = (char *)uprv_malloc(pathSize);
tempSize = uprv_wcstombs(path, myPath, tempSize); uprv_wcstombs(path, myPath, pathSize);
path[tempSize] = 0;
/*u_UCharsToChars(myPath, path, uprv_wcslen(myPath)+1);*/ /*u_UCharsToChars(myPath, path, uprv_wcslen(myPath)+1);*/
r = ures_open(path, localeID, status); r = ures_open(path, localeID, status);
uprv_free(path);
if (r == FALSE || U_FAILURE(*status)) { if (U_FAILURE(*status)) {
return NULL; return NULL;
} }
@ -1037,17 +1036,16 @@ U_CAPI UResourceBundle* U_EXPORT2 ures_openU(const UChar* myPath,
const char* localeID, const char* localeID,
UErrorCode* status) UErrorCode* status)
{ {
char path[100];
UResourceBundle *r; UResourceBundle *r;
int32_t pathlen = u_strlen(myPath); int32_t pathSize = u_strlen(myPath) + 1;
char *path = (char *)uprv_malloc(pathSize);
u_UCharsToChars(myPath, path, pathSize);
u_UCharsToChars(myPath, path, pathlen);
path[pathlen] = 0;
r = ures_open(path, localeID, status); r = ures_open(path, localeID, status);
uprv_free(path);
if (r == FALSE || U_FAILURE(*status)) { if (U_FAILURE(*status)) {
return NULL; return NULL;
} }