From 242eef6a6dee77d6897e2679d38ba8ba05cac40a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 17 Feb 2018 11:41:25 +0100 Subject: [PATCH] Prevent problems with empty strings in the future --- libretro-common/file/file_path.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c index 4ba3670262..4830898775 100644 --- a/libretro-common/file/file_path.c +++ b/libretro-common/file/file_path.c @@ -367,7 +367,8 @@ const char *path_get_archive_delim(const char *path) */ const char *path_get_extension(const char *path) { - const char *ext = strrchr(path_basename(path), '.'); + const char *ext = !string_is_empty(path) + ? strrchr(path_basename(path), '.') : NULL; if (!ext) return ""; return ext + 1; @@ -385,7 +386,8 @@ const char *path_get_extension(const char *path) */ char *path_remove_extension(char *path) { - char *last = (char*)strrchr(path_basename(path), '.'); + char *last = !string_is_empty(path) + ? (char*)strrchr(path_basename(path), '.') : NULL; if (!last) return NULL; if (*last)