sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-10-08 00:04:02 -04:00
Code Issues Projects Releases Wiki Activity

silence scan-build false positive

Browse Source 
blind attempt
This commit is contained in:
Yann Collet 2019-11-25 15:50:58 -08:00
parent 9a3de0a535
commit 5e657aca90
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
programs/util.c
View File

@ -629,8 +629,19 @@ UTIL_createExpandedFNT(const char** inputNames, size_t nbIfns, int followLinks)
if (buf + pos > bufend) { free(buf); free((void*)fileNamesTable); return NULL; } if (buf + pos > bufend) { free(buf); free((void*)fileNamesTable); return NULL; }
pos += strlen(fileNamesTable[ifnNb]) + 1; pos += strlen(fileNamesTable[ifnNb]) + 1;
} }
{ FileNamesTable* const fnt = UTIL_assembleFileNamesTable(fileNamesTable, nbFiles, buf);
return UTIL_assembleFileNamesTable(fileNamesTable, nbFiles, buf); #ifdef __clang_analyzer__
/* scan-build does not understand ownership transfer.
* In _some_ versions, it believes that there is a leak of @buf and @fileNamesTable
* on leaving the function, which is not the case,
* as they are referenced inside the object created by UTIL_assembleFileNamesTable().
* In order to silence this false warning, let's "pretend" that these memory objects are freed.
* This directive is only read by scan-build, due to __clang_analyzer__ macros */
free(buf);
free(fileNamesTable);
#endif
return fnt;
}
} }
} }
@ -648,7 +659,18 @@ FileNamesTable* UTIL_createFNT_fromROTable(const char** filenames, size_t nbFile
const char** const newFNTable = (const char**)malloc(sizeof_FNTable); const char** const newFNTable = (const char**)malloc(sizeof_FNTable);
if (newFNTable==NULL) return NULL; if (newFNTable==NULL) return NULL;
memcpy((void*)newFNTable, filenames, sizeof_FNTable); /* void* : mitigate a Visual compiler bug or limitation */ memcpy((void*)newFNTable, filenames, sizeof_FNTable); /* void* : mitigate a Visual compiler bug or limitation */
return UTIL_assembleFileNamesTable(newFNTable, nbFilenames, NULL); { FileNamesTable* const fnt = UTIL_assembleFileNamesTable(newFNTable, nbFilenames, NULL);;
#ifdef __clang_analyzer__
/* scan-build does not understand ownership transfer.
* In _some_ versions, it believes that there is a leak of @newFNTable
* on leaving the function, which is not the case,
* as they are referenced inside the object created by UTIL_assembleFileNamesTable().
* In order to silence this false warning, let's "pretend" that these memory objects are freed.
* This directive is only read by scan-build, due to __clang_analyzer__ macros */
free(newFNTable);
#endif
return fnt;
}
} }