From 0cc50ed4ea86302f67ac60568c67ac592453fc97 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 30 Jan 2015 07:45:14 +0100
Subject: [PATCH] (input_driver.c) Cleanups in config_get_input_driver_options

---
 input/input_driver.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/input/input_driver.c b/input/input_driver.c
index 0ee189862d..fd901f9eb6 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -116,6 +116,9 @@ const char* config_get_input_driver_options(void)
 
    attr.i = 0;
 
+   if (!options_l)
+      return NULL;
+
    for (i = 0; input_driver_find_handle(i); i++)
    {
       const char *opt = input_driver_find_ident(i);
@@ -125,6 +128,13 @@ const char* config_get_input_driver_options(void)
 
    options = (char*)calloc(options_len, sizeof(char));
 
+   if (!options)
+   {
+      string_list_free(options_l);
+      options_l = NULL;
+      return NULL;
+   }
+
    string_list_join_concat(options, options_len, options_l, "|");
 
    string_list_free(options_l);