diff --git a/cheats.c b/cheats.c
index 1eb99ba397..2957f70378 100644
--- a/cheats.c
+++ b/cheats.c
@@ -169,7 +169,7 @@ static void cheat_manager_load_config(cheat_manager_t *handle, const char *path,
       return;
    }
 
-   char *save;
+   char *save = NULL;
    const char *num = strtok_r(str, ";", &save);
    while (num)
    {
diff --git a/command.c b/command.c
index 07b2229ee5..473482e5de 100644
--- a/command.c
+++ b/command.c
@@ -301,7 +301,7 @@ static void parse_sub_msg(rarch_cmd_t *handle, const char *tok)
 
 static void parse_msg(rarch_cmd_t *handle, char *buf)
 {
-   char *save;
+   char *save = NULL;
    const char *tok = strtok_r(buf, "\n", &save);
    while (tok)
    {