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

(file_list.c) Do early returns if realloc fails, do early returns if

Browse Source 
list is NULL
This commit is contained in:
twinaphex 2015-03-12 14:00:27 +01:00
parent 6dc1d953f2
commit 3bbc52eb79
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libretro-common/file/file_list.c
View File

@ -32,10 +32,14 @@ void file_list_push(file_list_t *list,
{ {
if (list->size >= list->capacity) if (list->size >= list->capacity)
{ {
list->capacity++; list->capacity += 1;
list->capacity *= 2; list->capacity *= 2;
list->list = (struct item_file*)realloc(list->list, list->list = (struct item_file*)realloc(list->list,
list->capacity * sizeof(struct item_file)); list->capacity * sizeof(struct item_file));
if (!list->list)
return;
} }
list->list[list->size].label = NULL; list->list[list->size].label = NULL;
@ -68,6 +72,9 @@ size_t file_list_get_directory_ptr(const file_list_t *list)
void file_list_pop(file_list_t *list, size_t *directory_ptr) void file_list_pop(file_list_t *list, size_t *directory_ptr)
{ {
if (!list)
return;
if (list->size != 0) if (list->size != 0)
{ {
--list->size; --list->size;
@ -116,6 +123,9 @@ void file_list_clear(file_list_t *list)
{ {
size_t i; size_t i;
if (!list)
return;
for (i = 0; i < list->size; i++) for (i = 0; i < list->size; i++)
{ {
if (list->list[i].path) if (list->list[i].path)
@ -138,12 +148,18 @@ void file_list_copy(file_list_t *list, file_list_t *list_old)
{ {
size_t i; size_t i;
if (!list)
return;
list_old->size = list->size; list_old->size = list->size;
list_old->capacity = list->capacity; list_old->capacity = list->capacity;
list_old->list = (struct item_file*)realloc(list_old->list, list_old->list = (struct item_file*)realloc(list_old->list,
list_old->capacity * sizeof(struct item_file)); list_old->capacity * sizeof(struct item_file));
if (!list_old->list)
return;
for (i = 0; i < list->size; i++) for (i = 0; i < list->size; i++)
{ {
list_old->list[i].path = NULL; list_old->list[i].path = NULL;
@ -166,6 +182,9 @@ void file_list_copy(file_list_t *list, file_list_t *list_old)
void file_list_set_label_at_offset(file_list_t *list, size_t idx, void file_list_set_label_at_offset(file_list_t *list, size_t idx,
const char *label) const char *label)
{ {
if (!list)
return;
if (list->list[idx].label) if (list->list[idx].label)
free(list->list[idx].label); free(list->list[idx].label);
list->list[idx].alt = NULL; list->list[idx].alt = NULL;
@ -177,7 +196,7 @@ void file_list_set_label_at_offset(file_list_t *list, size_t idx,
void file_list_get_label_at_offset(const file_list_t *list, size_t idx, void file_list_get_label_at_offset(const file_list_t *list, size_t idx,
const char **label) const char **label)
{ {
if (!label) if (!label || !list)
return; return;
*label = list->list[idx].path; *label = list->list[idx].path;
@ -188,6 +207,9 @@ void file_list_get_label_at_offset(const file_list_t *list, size_t idx,
void file_list_set_alt_at_offset(file_list_t *list, size_t idx, void file_list_set_alt_at_offset(file_list_t *list, size_t idx,
const char *alt) const char *alt)
{ {
if (!list)
return;
if (list->list[idx].alt) if (list->list[idx].alt)
free(list->list[idx].alt); free(list->list[idx].alt);
list->list[idx].alt = NULL; list->list[idx].alt = NULL;
@ -199,6 +221,9 @@ void file_list_set_alt_at_offset(file_list_t *list, size_t idx,
void file_list_get_alt_at_offset(const file_list_t *list, size_t idx, void file_list_get_alt_at_offset(const file_list_t *list, size_t idx,
const char **alt) const char **alt)
{ {
if (!list)
return;
if (alt) if (alt)
*alt = list->list[idx].alt ? *alt = list->list[idx].alt ?
list->list[idx].alt : list->list[idx].path; list->list[idx].alt : list->list[idx].path;
@ -259,6 +284,9 @@ void *file_list_get_last_actiondata(const file_list_t *list)
void file_list_get_at_offset(const file_list_t *list, size_t idx, void file_list_get_at_offset(const file_list_t *list, size_t idx,
const char **path, const char **label, unsigned *file_type) const char **path, const char **label, unsigned *file_type)
{ {
if (!list)
return;
if (path) if (path)
*path = list->list[idx].path; *path = list->list[idx].path;
if (label) if (label)
@ -271,6 +299,9 @@ void file_list_get_last(const file_list_t *list,
const char **path, const char **label, const char **path, const char **label,
unsigned *file_type) unsigned *file_type)
{ {
if (!list)
return;
if (list->size) if (list->size)
file_list_get_at_offset(list, list->size - 1, path, label, file_type); file_list_get_at_offset(list, list->size - 1, path, label, file_type);
} }
@ -281,6 +312,9 @@ bool file_list_search(const file_list_t *list, const char *needle, size_t *idx)
const char *alt; const char *alt;
bool ret = false; bool ret = false;
if (!list)
return false;
for (i = 0; i < list->size; i++) for (i = 0; i < list->size; i++)
{ {
const char *str; const char *str;