From: ehofman <ehofman>
Date: Fri, 28 Nov 2003 20:25:50 +0000 (+0000)
Subject: Use strndup() replacement code that doesn't cause a segmentation fault.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4a68c2ffb0909b07dc094298e005522cef5162bc;p=flightgear.git

Use strndup() replacement code that doesn't cause a segmentation fault.
---

diff --git a/src/GUI/AirportList.cxx b/src/GUI/AirportList.cxx
index 73fbdd2aa..6e4570b6c 100644
--- a/src/GUI/AirportList.cxx
+++ b/src/GUI/AirportList.cxx
@@ -17,12 +17,15 @@ AirportList::AirportList (int x, int y, int width, int height)
     _content = new char *[_nAirports+1];
     for (int i = 0; i < _nAirports; i++) {
         const FGAirport * airport = _airports->getAirport(i);
-        snprintf(buf, 1023, "%s  %s\n",
+        snprintf(buf, 1023, "%s  %s\0",
                  airport->id.c_str(),
                  airport->name.c_str());
-        int str_len = strlen(buf);
-        _content[i] = new char[(str_len > 1023) ? 1024 : str_len+1];
-        strncpy(_content[i], buf, 1023);
+
+        unsigned int buf_len = (strlen(buf) > 1023) ? 1023 : strlen(buf);
+        
+        _content[i] = new char[buf_len+1];
+        memcpy(_content[i], buf, buf_len);
+        _content[i][buf_len+1] = '\0';
     }
     _content[_nAirports] = 0;
     newList(_content);