From fcb867578ec6bba0edae14aa21679fada7a0bb62 Mon Sep 17 00:00:00 2001
From: woglinde <woglinde@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Tue, 26 Jul 2011 16:14:29 +0000
Subject: Fix:osd_core:Do the null pointer check before assiging a variable,
 found with smatch

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4660 ffa7fe5e-494d-0410-b361-a75ebd5db220
---
 navit/osd/core/osd_core.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'navit/osd/core')

diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c
index bc086372f..e246ffee2 100644
--- a/navit/osd/core/osd_core.c
+++ b/navit/osd/core/osd_core.c
@@ -841,10 +841,14 @@ osd_cmd_interface_init(struct cmd_interface *this, struct navit *nav)
 static int
 osd_cmd_interface_set_attr(struct cmd_interface *this_, struct attr* attr)
 {
-	struct navit* nav = this_->osd_item.navit;
+	struct navit* nav;
+
 	if(NULL==attr || NULL==this_) {
 		return 0;
-	}	
+	}
+
+	nav = this_->osd_item.navit;
+
 	if(attr->type == attr_status_text) {
 		if(this_->text) {
 			g_free(this_->text);
-- 
cgit v1.2.1