libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-20 09:34:09 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Prevent undefined behavior reported by UBSan

Browse Source 
runtime error: member access within null pointer of type 'const struct dirent'
This commit is contained in:
Brad Parker 2018-02-02 11:41:54 -05:00
parent 81519d227b
commit dbe270476a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libretro-common/file/retro_dirent.c
View File

@ -138,7 +138,7 @@ struct RDIR *retro_opendir(const char *name)
#elif defined(VITA) || defined(PSP)
rdir->directory = sceIoDopen(name);
#elif defined(_3DS)
rdir->directory = (name && *name)? opendir(name) : NULL;
rdir->directory = !string_is_empty(name) ? opendir(name) : NULL;
rdir->entry = NULL;
#elif defined(__CELLOS_LV2__)
rdir->error = cellFsOpendir(name, &rdir->directory);
@ -147,7 +147,13 @@ struct RDIR *retro_opendir(const char *name)
rdir->entry = NULL;
#endif
return rdir;
if (rdir->directory)
return rdir;
else
{
free(rdir);
return NULL;
}
}
bool retro_dirent_error(struct RDIR *rdir)
@ -208,6 +214,7 @@ const char *retro_dirent_get_name(struct RDIR *rdir)
#elif defined(VITA) || defined(PSP) || defined(__CELLOS_LV2__)
return rdir->entry.d_name;
#else
return rdir->entry->d_name;
#endif
}