From ee80a34974d9835244297e4421dae661da601cd3 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 14 Nov 2014 23:06:34 -0500
Subject: [PATCH] Add/fix some trivial null checks

---
 compat/rxml/rxml.c | 3 +++
 gfx/d3d/d3d.cpp    | 3 +++
 menu/disp/lakka.c  | 6 +++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/compat/rxml/rxml.c b/compat/rxml/rxml.c
index 873dc0228d..bf44c1d303 100644
--- a/compat/rxml/rxml.c
+++ b/compat/rxml/rxml.c
@@ -44,6 +44,9 @@ static void rxml_free_node(struct rxml_node *node)
    struct rxml_node *head = NULL;
    struct rxml_attrib_node *attrib_node_head = NULL;
 
+   if (!node)
+      return;
+
    for (head = node->children; head; )
    {
       struct rxml_node *next_node = (struct rxml_node*)head->next;
diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 2974f1b220..c92ecf10c2 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -1464,6 +1464,9 @@ static void d3d_overlay_enable(void *data, bool state)
    unsigned i;
    d3d_video_t *d3d = (d3d_video_t*)data;
 
+   if (!d3d)
+      return;
+
    for (i = 0; i < d3d->overlays.size(); i++)
       d3d->overlays_enabled = state;
 
diff --git a/menu/disp/lakka.c b/menu/disp/lakka.c
index 8f2843a1d3..be3fd186b2 100644
--- a/menu/disp/lakka.c
+++ b/menu/disp/lakka.c
@@ -91,13 +91,13 @@ static void lakka_draw_text(lakka_handle_t *lakka,
       const char *str, float x,
       float y, float scale_factor, float alpha)
 {
+   if (!lakka)
+      return;
+
    if (alpha > lakka->global_alpha)
       alpha = lakka->global_alpha;
    uint8_t a8 = 255 * alpha;
 
-   if (!lakka)
-      return;
-
    if (a8 == 0)
       return;