From 22ac73ba263f68a4467571c400bddb56c2e3922d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 30 Jun 2016 16:10:09 +0200
Subject: [PATCH] Prevent null pointer dereference

---
 tasks/task_content.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tasks/task_content.c b/tasks/task_content.c
index 2359b13424..0ef9dbfee9 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1714,6 +1714,9 @@ bool task_push_content_load_default(
 {
    bool loading_from_menu = false;
 
+   if (!content_info)
+      return false;
+
    /* First we determine if we are loading from a menu */
    switch (mode)
    {
@@ -1749,7 +1752,7 @@ bool task_push_content_load_default(
       case CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_COMPANION_UI:
       case CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE:
 #ifdef HAVE_MENU
-         if (content_info && !content_info->environ_get)
+         if (!content_info->environ_get)
             content_info->environ_get = menu_content_environment_get;
 #endif
          break;