From: robertlipe <robertlipe@gmail.com>
Date: Sat, 8 Dec 2012 17:11:27 +0000 (+0000)
Subject: Trackfilter: don't rename track if we don't have a source track name.  Style
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~740
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=866184180d49a0816b6cf113f9f7644948e8ede2;p=gpsbabel.git

Trackfilter: don't rename track if we don't have a source track name.  Style
improvements on generating that new segment.
---

diff --git a/gpsbabel/trackfilter.c b/gpsbabel/trackfilter.c
index e2d64b645..9faa32813 100644
--- a/gpsbabel/trackfilter.c
+++ b/gpsbabel/trackfilter.c
@@ -943,9 +943,9 @@ trackfilter_seg2trk(void)
         dest = route_head_alloc();
         dest->rte_num = src->rte_num;
         /* name in the form TRACKNAME #n */
-        snprintf(trk_seg_num_buf, sizeof(trk_seg_num_buf), "%d", ++trk_seg_num);
-        dest->rte_name = (char*) xmalloc(strlen(src->rte_name)+strlen(trk_seg_num_buf)+3);
-        sprintf(dest->rte_name, "%s #%s", src->rte_name, trk_seg_num_buf);
+        if (src->rte_name) {
+          xasprintf(&dest->rte_name, "%s #%s", src->rte_name, ++trk_seg_num);
+        }
 
         /* Insert after original track or after last newly
          * created track */