From: James Turner <zakalawe@mac.com>
Date: Sun, 9 May 2010 10:11:52 +0000 (+0100)
Subject: Support ICAO identifiers with more than four characters, in the AirportsList.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=45fbd8008defc5f84b70fbf494fad8b153a2eb01;p=flightgear.git

Support ICAO identifiers with more than four characters, in the AirportsList.
---

diff --git a/src/Navaids/positioned.cxx b/src/Navaids/positioned.cxx
index 500de332b..91cd08d50 100644
--- a/src/Navaids/positioned.cxx
+++ b/src/Navaids/positioned.cxx
@@ -550,13 +550,14 @@ char** searchAirportNamesAndIdents(const std::string& aFilter)
   // We format results as follows (note whitespace!):
   //   ' name-of-airport-chars   (ident)'
   // so the total length is:
-  //    1 + strlen(name) + 4 + 4 (for the ident) + 1 + 1 (for the null)
-  // which gives a grand total of 11 + the length of the name.
-  // note the ident is sometimes only three letters for non-ICAO small strips
+  //    1 + strlen(name) + 4 + strlen(icao) + 1 + 1 (for the null)
+  // which gives a grand total of 7 + name-length + icao-length.
+  // note the ident can be three letters (non-ICAO local strip), four
+  // (default ICAO) or more (extended format ICAO)
   for (unsigned int i=0; i<numMatches; ++i) {
     int nameLength = matches[i]->name().size();
     int icaoLength = matches[i]->ident().size();
-    char* entry = new char[nameLength + 11];
+    char* entry = new char[7 + nameLength + icaoLength];
     char* dst = entry;
     *dst++ = ' ';
     memcpy(dst, matches[i]->name().c_str(), nameLength);