Elimination of lstrcpyn, and corrected a potential pointer bug.

This commit is contained in:
Peter Berg Larsen 2005-04-18 15:33:31 +00:00 committed by Alexandre Julliard
parent f525f182f2
commit 716bf4d6fb
1 changed files with 8 additions and 6 deletions

View File

@ -35,15 +35,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
static void module_fill_module(const char* in, char* out, unsigned size) static void module_fill_module(const char* in, char* out, unsigned size)
{ {
const char* ptr; const char *ptr,*endptr;
unsigned len; unsigned len;
for (ptr = in + strlen(in) - 1; endptr = in + strlen(in);
*ptr != '/' && *ptr != '\\' && ptr >= in; for (ptr = endptr - 1;
ptr >= in && *ptr != '/' && *ptr != '\\';
ptr--); ptr--);
if (ptr < in || *ptr == '/' || *ptr == '\\') ptr++; ptr++;
lstrcpynA(out, ptr, size); len = min(endptr-ptr,size-1);
len = strlen(out); memcpy(out, ptr, len);
out[len] = '\0';
if (len > 4 && if (len > 4 &&
(!strcasecmp(&out[len - 4], ".dll") || !strcasecmp(&out[len - 4], ".exe"))) (!strcasecmp(&out[len - 4], ".dll") || !strcasecmp(&out[len - 4], ".exe")))
out[len - 4] = '\0'; out[len - 4] = '\0';