提交 f744f92a 编写于 作者: R Richard Levitte

From LPlib:

Apparently, the length *including* the NUL byte should be used.

Contributed by Andy Polyakov <appro@fy.chalmers.se>
上级 75f134c0
...@@ -72,9 +72,10 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) ...@@ -72,9 +72,10 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
if (sizeof(TCHAR) != sizeof(char)) if (sizeof(TCHAR) != sizeof(char))
{ {
TCHAR *wdir = NULL; TCHAR *wdir = NULL;
size_t index = 0,len = strlen(direcory); /* len_0 denotes string length *with* trailing 0 */
size_t index = 0,len_0 = strlen(direcory) + 1;
wdir = (TCHAR *)malloc((len + 1) * sizeof(TCHAR)); wdir = (TCHAR *)malloc(len_0 * sizeof(TCHAR));
if (wdir == NULL) if (wdir == NULL)
{ {
free(*ctx); free(*ctx);
...@@ -84,9 +85,9 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) ...@@ -84,9 +85,9 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
} }
#ifdef LP_MULTIBYTE_AVAILABLE #ifdef LP_MULTIBYTE_AVAILABLE
if (!MultiByteToWideChar(CP_ACP, 0, directory, len, wdir, len + 1)) if (!MultiByteToWideChar(CP_ACP, 0, directory, len_0, wdir, len_0))
#endif #endif
for (index = 0; index < strlen(directory) + 1; index++) for (index = 0; index < len_0; index++)
wdir[index] = (TCHAR)directory[index]; wdir[index] = (TCHAR)directory[index];
(*ctx)->handle = FindFirstFile(wdir, &(*ctx)->ctx); (*ctx)->handle = FindFirstFile(wdir, &(*ctx)->ctx);
...@@ -115,16 +116,16 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) ...@@ -115,16 +116,16 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
if (sizeof(TCHAR) != sizeof(char)) if (sizeof(TCHAR) != sizeof(char))
{ {
TCHAR *wdir = (*ctx)->ctx.cFileName; TCHAR *wdir = (*ctx)->ctx.cFileName;
size_t index, len; size_t index, len_0 = 0;
for (len = 0; wdir[len] && len < (sizeof((*ctx)->entry_name) - 1);) while (wdir[len] && len < (sizeof((*ctx)->entry_name) - 1)) len_0++;
len++; len_0++;
#ifdef LP_MULTIBYTE_AVAILABLE #ifdef LP_MULTIBYTE_AVAILABLE
if (!WideCharToMultiByte(CP_ACP, 0, wdir, len, (*ctx)->entry_name, if (!WideCharToMultiByte(CP_ACP, 0, wdir, len_0, (*ctx)->entry_name,
sizeof((*ctx)->entry_name) - 1, NULL, 0)) sizeof((*ctx)->entry_name), NULL, 0))
#endif #endif
for (index = 0; index < len; index++) for (index = 0; index < len_0; index++)
(*ctx)->entry_name[index] = (char)wdir[index]; (*ctx)->entry_name[index] = (char)wdir[index];
} }
else else
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册