From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 22 Dec 2014 19:32:31 +0000 (+0000)
Subject: Don't let Google format reader crash on malformed route input.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4d57bc4dd879d7fab86246bc48586c463467434e;p=gpsbabel.git

Don't let Google format reader crash on malformed route input.
---

diff --git a/gpsbabel/google.cc b/gpsbabel/google.cc
index 01786de99..86bdfc44c 100644
--- a/gpsbabel/google.cc
+++ b/gpsbabel/google.cc
@@ -103,10 +103,12 @@ void goog_segment(xg_string args, const QXmlStreamAttributes*)
 {
   Waypoint* wpt_tmp;
 
-  wpt_tmp = route_find_waypt_by_name(routehead[goog_segroute], goog_segname);
-  if (wpt_tmp) {
-    wpt_tmp->shortname = mkshort(desc_handle, args);
-    wpt_tmp->description = args;
+  if (routehead[goog_segroute]) {
+    wpt_tmp = route_find_waypt_by_name(routehead[goog_segroute], goog_segname);
+    if (wpt_tmp) {
+      wpt_tmp->shortname = mkshort(desc_handle, args);
+      wpt_tmp->description = args;
+    }
   }
 }
 
@@ -285,6 +287,7 @@ google_read(void)
   routehead = (route_head**)xmalloc(sizeof(route_head*));
   routecount = (int*)xmalloc(sizeof(int));
   goog_segroute = 0;
+  routehead[goog_segroute] = NULL;
 
   goog_read_file();