From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Fri, 15 Oct 2021 00:29:54 +0000 (-0600)
Subject: fix an out of bounds access to a QString in tpo. (#738)
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~2^2~74
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=980b075c2c18a8c64d5e39d17100022fb74b6227;p=gpsbabel.git

fix an out of bounds access to a QString in tpo. (#738)

This was caught with Qt6.2.0, which has an assertion to check for
out of bounds access.
ASSERT: "i >= 0 && i < size()" in file .../Qt-6.2.0/6.2.0/gcc_64/include/QtCore/qstring.h, line 1325
---

diff --git a/tpo.cc b/tpo.cc
index e724e97f8..c47741156 100644
--- a/tpo.cc
+++ b/tpo.cc
@@ -571,10 +571,6 @@ static void tpo_process_tracks()
 #ifdef Tracks2012
     //TBD: Should this be TRACKNAMELENGTH?
     for (unsigned xx = 0; xx < 3; xx++) {
-#else
-    // Should limit be TRACKNAMELENGTH? No! But also should not be '3' like it was.
-    for (unsigned xx = 0; (styles[ii].name[xx] != 0); xx++) {
-#endif
       if (styles[ii].name[xx] == ',') {
         styles[ii].name[xx] = '_';
       }
@@ -582,6 +578,11 @@ static void tpo_process_tracks()
         styles[ii].name[xx] = '_';
       }
     }
+#else
+    // Should limit be TRACKNAMELENGTH? No! But also should not be '3' like it was.
+    styles[ii].name.replace(',', '_');
+    styles[ii].name.replace('=', '_');
+#endif
 
     // one byte for line width (value 1-4), one byte for 'dashed' boolean
     styles[ii].wide = (uint8_t) gbfgetc(tpo_file_in);