Fix:core:Do not crash when navit.layout or navit.layout_name is attempted to be set to NULL.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5869 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 4 insertions, 0 deletions

diff --git a/navit/navit.c b/navit/navit.c
index 0a5c2f39..243055b3 100644
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -2429,6 +2429,8 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
 		this_->vehicle->follow_curr = attr->u.num;
 		break;
 	case attr_layout:
+		if(!attr->u.layout)
+			return 0;
 		if(this_->layout_current!=attr->u.layout) {
 			this_->layout_current=attr->u.layout;
 			graphics_font_destroy_all(this_->gra);
@@ -2439,6 +2441,8 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
 		}
 		break;
 	case attr_layout_name:
+		if(!attr->u.str)
+			return 0;
 		l=this_->layouts;
 		while (l) {
 			lay=l->data;