mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle null and empty string calls to retro_opendir with a consistent null return.

Browse Source
This commit is contained in:
David Walters 2018-04-13 10:31:21 +01:00
parent 8fe51864a6
commit adf4ed960e
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,14 +106,16 @@ struct RDIR *retro_opendir(const char *name)
wchar_t *path_wide = NULL; wchar_t *path_wide = NULL;
unsigned path_len; unsigned path_len;
#endif #endif
struct RDIR *rdir = (struct RDIR*)calloc(1, sizeof(*rdir)); struct RDIR *rdir;
if (!rdir||!name) /*Reject null or empty string paths*/
{ if (!name||(*name==0))
if (rdir) return NULL;
free(rdir);
/*Allocate RDIR struct. Tidied later with retro_closedir*/
rdir = (struct RDIR*)calloc(1, sizeof(*rdir));
if (!rdir)
return NULL; return NULL;
}
#if defined(_WIN32) #if defined(_WIN32)
(void)path_wide; (void)path_wide;

10
libretro-common/include/retro_dirent.h
View File

@ -32,6 +32,16 @@ RETRO_BEGIN_DECLS
typedef struct RDIR RDIR; typedef struct RDIR RDIR;
/**
*
* retro_opendir:
* @name : path to the directory to open.
*
* Opens a directory for reading. Tidy up with retro_closedir.
*
* Returns: RDIR pointer on success, NULL if name is not a
* valid directory, null itself or the empty string.
*/
struct RDIR *retro_opendir(const char *name); struct RDIR *retro_opendir(const char *name);
int retro_readdir(struct RDIR *rdir); int retro_readdir(struct RDIR *rdir);