From: tsteven4 <tsteven4@gmail.com>
Date: Wed, 8 Nov 2017 13:39:32 +0000 (-0700)
Subject: fix potential buffer overflow in lowranceusr4 reader.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~115^2~1^2~225^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=acc8dafdf20296d6cc5616e26a082ed462f4c851;p=gpsbabel.git

fix potential buffer overflow in lowranceusr4 reader.
---

diff --git a/lowranceusr4.cc b/lowranceusr4.cc
index f2470453e..53436d8be 100644
--- a/lowranceusr4.cc
+++ b/lowranceusr4.cc
@@ -85,8 +85,8 @@ lowranceusr4_readstr(char* buf, const int maxlen, gbfile* file, int bytes_per_ch
     buf[0] = '\0'; /* seems len=-1 means no string */
     return 0;
   } else if (len) {
-    if (len > maxlen*bytes_per_char) {
-      len = maxlen*bytes_per_char;
+    if (len > maxlen) {
+      len = maxlen;
     }
     if (bytes_per_char == 1) {
       bytesread += gbfread(buf, 1, len, file);