From 3d4be395ef931b76aa63b17e8c533ac4669b38e6 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 30 Jan 2015 07:55:55 +0100
Subject: [PATCH] Update camera_driver.c

---
 camera/camera_driver.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/camera/camera_driver.c b/camera/camera_driver.c
index 2200ab40f9..76cc1d996b 100644
--- a/camera/camera_driver.c
+++ b/camera/camera_driver.c
@@ -86,6 +86,9 @@ const char* config_get_camera_driver_options(void)
 
    attr.i = 0;
 
+   if (!options_l)
+      return NULL;
+
    for (i = 0; camera_driver_find_handle(i); i++)
    {
       const char *opt = camera_driver_find_ident(i);
@@ -95,6 +98,13 @@ const char* config_get_camera_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);