LocalPath : update to fix possible string overflow

Common/Header/Utils.h

@@ -43,17 +43,6 @@ void TrimRight(TCHAR* str);
 // Parse string (new lines etc) and malloc the string
 TCHAR* StringMallocParse(const TCHAR* old_string);
 
-void LocalPath(TCHAR* buf, const TCHAR* file = TEXT("")) gcc_nonnull_all;
-void LocalPath(TCHAR* buffer, const TCHAR* SubPath, const TCHAR* file) gcc_nonnull_all;
-
-void SystemPath(TCHAR* buf, const TCHAR* file = TEXT("")) gcc_nonnull_all;
-void SystemPath(TCHAR* buffer, const TCHAR* SubPath, const TCHAR* file) gcc_nonnull_all;
-
-void RemoveFilePathPrefix(const TCHAR* szPrefix, TCHAR* szFilePath) gcc_nonnull_all;
-
-const TCHAR *LKGetLocalPath();
-const TCHAR *LKGetSystemPath();
-
 void LK_tsplitpath(const TCHAR* path, TCHAR* drv, TCHAR* dir, TCHAR* name, TCHAR* ext);
 
 void propGetFontSettingsFromString(const TCHAR *Buffer, LOGFONT* lplf);

Common/Source/AirfieldDetails.cpp

@@ -12,6 +12,7 @@
 #include "AirfieldDetails.h"
 #include "Waypointparser.h"
 #include "utils/zzip_stream.h"
+#include "LocalPath.h"
 
 void LookupAirfieldDetail(TCHAR *Name, TCHAR *Details) {
   TCHAR UName[NAME_SIZE + 1];

Common/Source/Airspace/LKAirspace.cpp

@@ -33,6 +33,7 @@
 #include "Library/TimeFunctions.h"
 #include "Baro.h"
 #include "utils/lookup_table.h"
+#include "LocalPath.h"
 
 using xml_document = rapidxml::xml_document<char>;
 using xml_attribute = rapidxml::xml_attribute<char>;

Common/Source/Bitmaps.cpp

@@ -15,6 +15,7 @@
 #include "Bitmaps.h"
 #include "resource_data.h"
 #include "Asset.hpp"
+#include "LocalPath.h"
 
 
 using std::placeholders::_1;

Common/Source/Calc/DoRecent.cpp

@@ -7,6 +7,7 @@
 */
 
 #include "externs.h"
+#include "LocalPath.h"
 
 namespace {
 

Common/Source/Comm/FilePort.cpp

@@ -13,6 +13,7 @@
 #include <functional>
 #include "utils/stringext.h"
 #include "OS/Sleep.h"
+#include "LocalPath.h"
 
 using namespace std::placeholders;
 

Common/Source/Devices/DeviceSettings.cpp

@@ -11,6 +11,7 @@
 #include "externs.h"
 #include "Utils.h"
 #include <fstream>
+#include "LocalPath.h"
 
 namespace {
 

Common/Source/Devices/devLXNano3.cpp

@@ -36,6 +36,7 @@
 #include "utils/printf.h"
 #include "Comm/UpdateQNH.h"
 #include "Comm/ExternalWind.h"
+#include "LocalPath.h"
 
 #define NANO_PROGRESS_DLG
 #define BLOCK_SIZE 32

Common/Source/Dialogs/dlgChecklist.cpp

@@ -16,6 +16,7 @@
 #include "resource.h"
 #include "utils/zzip_stream.h"
 #include <vector>
+#include "LocalPath.h"
 
 
 #define MAXNOTETITLE 200	// max number of characters in a title note

Common/Source/Dialogs/dlgEOSIGCDownload.cpp

@@ -17,6 +17,7 @@
 #include "dlgIGCProgress.h"
 #include "utils/tokenizer.h"
 #include "utils/printf.h"
+#include "LocalPath.h"
 
 #define EOS_PRPGRESS_DLG    
 
@@ -201,10 +202,8 @@ static void OnMultiSelectListListInfo(WndListFrame *Sender, WndListFrame::ListIn
   }
 
 }
-
-bool GetEOSIGCFilename(TCHAR *IGCFilename, TCHAR *InFilename) {
-  if (IGCFilename == NULL)
-    return false;
+static
+bool GetEOSIGCFilename(TCHAR (&IGCFilename)[MAX_PATH], TCHAR *InFilename) {
   TCHAR Tmp[MAX_PATH];
 
   _tcscpy(Tmp, InFilename);

Common/Source/Dialogs/dlgFlarmIGCDownload.cpp

@@ -17,6 +17,7 @@
 #include "dlgFlarmIGCDownload.h"
 #include "utils/tokenizer.h"
 #include "utils/printf.h"
+#include "LocalPath.h"
 
 #define MAX_FLARM_ANSWER_LEN 640 
       // FLARM Docu does not tell the max. answer len
@@ -367,11 +368,9 @@ static void OnMultiSelectListListInfo(WndListFrame *Sender,
   }
 }
 
-bool GetIGCFilename(TCHAR *IGCFilename, int Idx) {
-  if (IGCFilename == NULL)
-    return false;
+static
+bool GetIGCFilename(TCHAR (&IGCFilename)[MAX_PATH], int Idx) {
   TCHAR Tmp[MAX_PATH];
-
   _tcscpy(Tmp, IGCFileList.at(Idx).Line1);
   TCHAR *Filename = lk::tokenizer<TCHAR>(Tmp).Next(TEXT(" "));
   if(Filename) {

Common/Source/Dialogs/dlgIgcFile.cpp

@@ -17,6 +17,7 @@
 #include <iterator>
 #include "utils/stl_utils.h"
 #include "resource.h"
+#include "LocalPath.h"
 
 #ifdef ANDROID
 #include "Android/LK8000Activity.h"

Common/Source/Dialogs/dlgLXIGCDownload.cpp

@@ -15,6 +15,7 @@
 #include "dlgLXIGCDownload.h"
 #include "utils/tokenizer.h"
 #include "utils/printf.h"
+#include "LocalPath.h"
 
 #define LST_STRG_LEN          100
 
@@ -167,9 +168,8 @@ static void OnMultiSelectListListInfo(WndListFrame *Sender, WndListFrame::ListIn
 
 }
 
-bool GetLXIGCFilename(TCHAR *IGCFilename, TCHAR *InFilename) {
-  if (IGCFilename == NULL)
-    return false;
+static
+bool GetLXIGCFilename(TCHAR (&IGCFilename)[MAX_PATH], TCHAR *InFilename) {
   TCHAR Tmp[MAX_PATH];
 
   _tcscpy(Tmp, InFilename);

Common/Source/Dialogs/dlgProfiles.cpp

@@ -13,6 +13,7 @@
 #include "WindowControls.h"
 #include "resource.h"
 #include "utils/printf.h"
+#include "LocalPath.h"
 
 static WndForm *wf=NULL;
 static short profilemode=0;

Common/Source/Dialogs/dlgStartup.cpp

@@ -22,6 +22,7 @@
 #include "InfoBoxLayout.h"
 #include "LKInterface.h"
 #include "utils/printf.h"
+#include "LocalPath.h"
 
 #ifdef KOBO
   #include "Kobo/Kernel.hpp"

Common/Source/Dialogs/dlgTaskOverview.cpp

@@ -17,6 +17,7 @@
 #include "resource.h"
 #include "utils/printf.h"
 #include "Waypoints/SetHome.h"
+#include "LocalPath.h"
 
 #ifdef ANDROID
 #include "Android/LK8000Activity.h"

Common/Source/Draw/LoadSplash.cpp

@@ -9,6 +9,7 @@
 #include "externs.h"
 #include "resource.h"
 #include "ScreenGeometry.h"
+#include "LocalPath.h"
 
 #ifdef USE_GDI
 #define IMG_EXT "BMP"

Common/Source/FlarmIdFile.cpp

@@ -10,6 +10,7 @@
 #include "utils/zzip_stream.h"
 #include "utils/charset_helper.h"
 #include <iostream>
+#include "LocalPath.h"
 
 namespace {
 

Common/Source/FlarmTools.cpp

@@ -11,6 +11,7 @@
 #include "utils/zzip_stream.h"
 #include <unordered_map>
 #include <memory>
+#include "LocalPath.h"
 
 namespace {
 

Common/Source/InputEvents.cpp

@@ -39,6 +39,7 @@
 #include "utils/lookup_table.h"
 #include <type_traits>
 #include "Waypoints/SetHome.h"
+#include "LocalPath.h"
 // uncomment for show all menu button with id as Label.
 //#define TEST_MENU_LAYOUT
 

Common/Source/LKInstall.cpp

@@ -16,6 +16,7 @@
 #endif
 #endif
 #include "utils/openzip.h"
+#include "LocalPath.h"
 
 
 

Common/Source/LKLanguage.cpp

@@ -11,6 +11,7 @@
 #include "utils/zzip_stream.h"
 #include "picojson.h"
 #include <istream>
+#include "LocalPath.h"
 #ifdef ANDROID
   #include "Android/Main.hpp"
   #include "Android/NativeView.hpp"

Common/Source/LKProfileLoad.cpp

@@ -19,6 +19,7 @@
 #include <Tracking/Tracking.h>
 #include "utils/printf.h"
 #include "utils/unique_file_ptr.h"
+#include "LocalPath.h"
 
 #ifdef ANDROID
   #include "Android/BluetoothHelper.hpp"

Common/Source/LKUtils.cpp

@@ -16,6 +16,7 @@
 #include "Library/TimeFunctions.h"
 #include "Baro.h"
 #include "InputEvents.h"
+#include "LocalPath.h"
 
 extern TCHAR LastTaskFileName[MAX_PATH];
 

Common/Source/Library/DirectoryFunctions.cpp

@@ -7,6 +7,7 @@
 */
 
 #include "externs.h"
+#include "LocalPath.h"
 
 void CreateDirectoryIfAbsent(const TCHAR *filename) {
   TCHAR fullname[MAX_PATH];