blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: BLI_listdir (direntry): get rid of usage of raw malloc/free here. 

No reason at all not to use MEM_xxx as everywhere else, especially confusing
when members of direntry **are** MEM_-allocated (relname, etc.)!
This commit is contained in:
Bastien Montagne 2015-02-15 15:04:28 +01:00
parent 35567d563d
commit 2e9105cc96
Notes: blender-bot 2023-02-14 09:29:36 +01:00 
Referenced by issue #43694, Hair Clumps Point to Scene Center When Density is Texture-Controlled
Referenced by issue #43684, File Browser is unusable on Windows Machines
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenlib/intern/storage.c
View File

@ -219,7 +219,6 @@ static void bli_builddir(struct BuildDirCtx *dir_ctx, const char *dirname)
DIR *dir;
if ((dir = opendir(dirname)) != NULL) {
const struct dirent *fname;
while ((fname = readdir(dir)) != NULL) {
struct dirlink * const dlink = (struct dirlink *)malloc(sizeof(struct dirlink));
@ -231,20 +230,19 @@ static void bli_builddir(struct BuildDirCtx *dir_ctx, const char *dirname)
}
if (newnum) {
if (dir_ctx->files) {
void * const tmp = realloc(dir_ctx->files, (dir_ctx->nrfiles + newnum) * sizeof(struct direntry));
void * const tmp = MEM_reallocN(dir_ctx->files, (dir_ctx->nrfiles + newnum) * sizeof(struct direntry));
if (tmp) {
dir_ctx->files = (struct direntry *)tmp;
}
else { /* realloc fail */
free(dir_ctx->files);
MEM_freeN(dir_ctx->files);
dir_ctx->files = NULL;
}
}
if (dir_ctx->files == NULL)
dir_ctx->files = (struct direntry *)malloc(newnum * sizeof(struct direntry));
dir_ctx->files = (struct direntry *)MEM_mallocN(newnum * sizeof(struct direntry), __func__);
if (dir_ctx->files) {
struct dirlink * dlink = (struct dirlink *) dirbase.first;
@ -405,7 +403,7 @@ unsigned int BLI_filelist_dir_contents(const char *dirname, struct direntry **f
else {
// keep blender happy. Blender stores this in a variable
// where 0 has special meaning.....
*filelist = malloc(sizeof(struct direntry));
*filelist = MEM_mallocN(sizeof(**filelist), __func__);
}
return dir_ctx.nrfiles;
@ -422,7 +420,7 @@ void BLI_filelist_duplicate(
{
unsigned int i;
*dest_filelist = malloc(sizeof(**dest_filelist) * (size_t)(nrentries));
*dest_filelist = MEM_mallocN(sizeof(**dest_filelist) * (size_t)(nrentries), __func__);
for (i = 0; i < nrentries; ++i) {
struct direntry * const src = &src_filelist[i];
struct direntry *dest = &(*dest_filelist)[i];
@ -461,7 +459,7 @@ void BLI_filelist_free(struct direntry *filelist, unsigned int nrentries, void (
free_poin(entry->poin);
}
free(filelist);
MEM_freeN(filelist);
}

1
source/blender/blenloader/BLO_readfile.h
View File

@ -37,7 +37,6 @@ extern "C" {
#endif
struct bScreen;
struct direntry;
struct LinkNode;
struct Main;
struct MemFile;