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

PVS: V575 The null pointer is passed into 'strcpy' function. Inspect the first argument

Browse Source
This commit is contained in:
wmayer
2020-07-17 15:04:33 +02:00
parent 4dae806188
commit e1363e5d0f
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,8 +399,7 @@ private:
char* Name;
const char* DocName=0;
const char* optionSource = nullptr;
char* defaultOptions = "User parameter:BaseApp/Preferences/Mod/Draft";
char* useOptionSource = nullptr;
std::string defaultOptions = "User parameter:BaseApp/Preferences/Mod/Draft";
bool IgnoreErrors=true;
if (!PyArg_ParseTuple(args.ptr(), "et|sbs","utf-8",&Name,&DocName,&IgnoreErrors,&optionSource))
throw Py::Exception();
@@ -412,6 +411,8 @@ private:
if (!file.exists())
throw Py::RuntimeError("File doesn't exist");
if (optionSource)
defaultOptions = optionSource;
App::Document *pcDoc;
if (DocName)
@@ -421,16 +422,10 @@ private:
if (!pcDoc)
pcDoc = App::GetApplication().newDocument(DocName);
if (optionSource) {
strcpy(useOptionSource,optionSource);
} else {
useOptionSource = defaultOptions;
}
try {
// read the DXF file
ImpExpDxfRead dxf_file(EncodedName,pcDoc);
dxf_file.setOptionSource(useOptionSource);
dxf_file.setOptionSource(defaultOptions);
dxf_file.setOptions();
dxf_file.DoRead(IgnoreErrors);
pcDoc->recompute();