From a604dab0b8c910e7f070b798aff228a3f0525425 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sun, 3 Mar 2019 15:39:38 +0100
Subject: [PATCH] cannot use null pointer as target for strcpy

---
 src/Mod/Import/App/AppImportPy.cpp | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/Mod/Import/App/AppImportPy.cpp b/src/Mod/Import/App/AppImportPy.cpp
index b2dd647085..dfb6234e5a 100644
--- a/src/Mod/Import/App/AppImportPy.cpp
+++ b/src/Mod/Import/App/AppImportPy.cpp
@@ -432,8 +432,7 @@ private:
         std::string filePath;
         std::string layerName;
         const char* optionSource = nullptr;
-        char* defaultOptions = "User parameter:BaseApp/Preferences/Mod/Import";
-        char* useOptionSource = nullptr;
+        std::string defaultOptions = "User parameter:BaseApp/Preferences/Mod/Import";
         int   versionParm = -1;
         bool  versionOverride = false;
         bool  polyOverride = false;
@@ -459,14 +458,12 @@ private:
                polyOverride = true; 
             }
             if (optionSource != nullptr) {
-                strcpy(useOptionSource,optionSource);
-            } else {
-                useOptionSource = defaultOptions;
+                defaultOptions = optionSource;
             }
 
             try {
                 ImpExpDxfWrite writer(filePath);
-                writer.setOptionSource(useOptionSource);
+                writer.setOptionSource(defaultOptions);
                 writer.setOptions();
                 if (versionOverride) {
                     writer.setVersion(versionParm);
@@ -508,14 +505,12 @@ private:
                polyOverride = true; 
             }
             if (optionSource != nullptr) {
-                strcpy(useOptionSource,optionSource);
-            } else {
-                useOptionSource = defaultOptions;
+                defaultOptions = optionSource;
             }
 
             try {
                 ImpExpDxfWrite writer(filePath);
-                writer.setOptionSource(useOptionSource);
+                writer.setOptionSource(defaultOptions);
                 writer.setOptions();
                 if (versionOverride) {
                     writer.setVersion(versionParm);
@@ -544,8 +539,7 @@ private:
         std::string filePath;
         std::string layerName;
         const char* optionSource = nullptr;
-        char* defaultOptions = "User parameter:BaseApp/Preferences/Mod/Import";
-        char* useOptionSource = nullptr;
+        std::string defaultOptions = "User parameter:BaseApp/Preferences/Mod/Import";
         int   versionParm = -1;
         bool  versionOverride = false;
         bool  polyOverride = false;
@@ -571,14 +565,12 @@ private:
             }
 
             if (optionSource != nullptr) {
-                strcpy(useOptionSource,optionSource);
-            } else {
-                useOptionSource = defaultOptions;
+                defaultOptions = optionSource;
             }
 
             try {
                 ImpExpDxfWrite writer(filePath);
-                writer.setOptionSource(useOptionSource);
+                writer.setOptionSource(defaultOptions);
                 writer.setOptions();
                 if (versionOverride) {
                     writer.setVersion(versionParm);
@@ -624,14 +616,12 @@ private:
             }
 
             if (optionSource != nullptr) {
-                strcpy(useOptionSource,optionSource);
-            } else {
-                useOptionSource = defaultOptions;
+                defaultOptions = optionSource;
             }
             
             try {
                 ImpExpDxfWrite writer(filePath);
-                writer.setOptionSource(useOptionSource);
+                writer.setOptionSource(defaultOptions);
                 writer.setOptions();
                 if (versionOverride) {
                     writer.setVersion(versionParm);