From 917f8fa996536f5bfa35bfa5374d2fe9cded0060 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 26 Oct 2016 03:19:46 +0200
Subject: [PATCH] Prevent explicit NULL dereferenced

---
 menu/cbs/menu_cbs_get_value.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index b3fcdf8964..b6c79ee92a 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -506,7 +506,9 @@ static void menu_action_setting_disp_set_label_input_desc(
             str = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y);
             break;
       }
-      strlcpy(s, str, len);
+
+      if (!string_is_empty(str))
+         strlcpy(s, str, len);
    }
 
    *w = 19;