diff options
| author | LordJZ <a553r7fa1l3d@gmail.com> | 2012-06-05 04:17:10 +0400 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2012-07-03 17:16:30 +0200 |
| commit | 459257b0563f3c085e5e1f3cb988309309377f46 (patch) | |
| tree | e7d9c2bec0615172518039f0df19ac4b48115532 /dep/StormLib/src/SFileFindFile.cpp | |
| parent | 6fe1657fe98035d9a762d2e92f275826bec6d1fe (diff) | |
Update StormLib
Diffstat (limited to 'dep/StormLib/src/SFileFindFile.cpp')
| -rw-r--r-- | dep/StormLib/src/SFileFindFile.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/dep/StormLib/src/SFileFindFile.cpp b/dep/StormLib/src/SFileFindFile.cpp index 542637b3668..aa065d23a84 100644 --- a/dep/StormLib/src/SFileFindFile.cpp +++ b/dep/StormLib/src/SFileFindFile.cpp @@ -31,7 +31,7 @@ struct TMPQSearch DWORD dwSearchTableItems; // Number of items in the search table DWORD dwNextIndex; // Next file index to be checked DWORD dwFlagMask; // For checking flag mask - char * szSearchMask; // Search mask (variable length) + char szSearchMask[1]; // Search mask (variable length) }; //----------------------------------------------------------------------------- @@ -69,7 +69,7 @@ bool CheckWildCard(const char * szString, const char * szWildCard) szString++; } - // If there is '*', means zero or more chars. We have to + // If there is '*', means zero or more chars. We have to // find the sequence after '*' if(*szWildCard == '*') { @@ -337,8 +337,6 @@ static void FreeMPQSearch(TMPQSearch *& hs) { if(hs->pSearchTable != NULL) STORM_FREE(hs->pSearchTable); - if(hs->szSearchMask != NULL) - free(hs->szSearchMask); // allocated with strdup STORM_FREE(hs); hs = NULL; } @@ -378,7 +376,7 @@ HANDLE WINAPI SFileFindFirstFile(HANDLE hMpq, const char * szMask, SFILE_FIND_DA if(nError == ERROR_SUCCESS) { memset(hs, 0, sizeof(TMPQSearch)); - hs->szSearchMask = strdup(szMask); + strcpy(hs->szSearchMask, szMask); hs->dwFlagMask = MPQ_FILE_EXISTS; hs->ha = ha; @@ -408,7 +406,7 @@ HANDLE WINAPI SFileFindFirstFile(HANDLE hMpq, const char * szMask, SFILE_FIND_DA FreeMPQSearch(hs); SetLastError(nError); } - + // Return the result value return (HANDLE)hs; } |