kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

cannot use null pointer as target for strcpy

Browse Source
This commit is contained in:
wmayer
2019-03-03 15:39:38 +01:00
parent b1909bff4d
commit a604dab0b8
1 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mod/Import/App/AppImportPy.cpp
View File

@@ -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);