From 304f0e0492c9a85f6fb2a79cc7064e997a13fcfc Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 9 Feb 2015 11:03:16 -0500
Subject: [PATCH] settings_data: Fix potential null pointer dereference

---
 settings_data.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/settings_data.c b/settings_data.c
index 822a5f0537..f07da6acdc 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -430,11 +430,12 @@ static int setting_data_bind_action_start(void *data)
 {
    rarch_setting_t *setting = (rarch_setting_t*)data;
    struct retro_keybind *def_binds = (struct retro_keybind *)retro_keybinds_1;
-   struct retro_keybind *keybind = (struct retro_keybind*)setting->value.keybind;
+   struct retro_keybind *keybind = NULL;
 
    if (!setting || !driver.menu)
       return -1;
 
+   keybind = (struct retro_keybind*)setting->value.keybind;
    if (!keybind)
       return -1;