Skip to content

Commit

Permalink
fix access violation when configDirectory is empty
Browse files Browse the repository at this point in the history
  • Loading branch information
Damien Gerard authored and BYVoid committed Jul 14, 2020
1 parent 4d19b73 commit f5a8a05
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/Config.cpp
Expand Up @@ -255,10 +255,14 @@ ConverterPtr Config::NewFromString(const std::string& json,
}

ConfigInternal* impl = (ConfigInternal*)internal;
if (configDirectory.back() == '/' || configDirectory.back() == '\\')
impl->configDirectory = configDirectory;
else
impl->configDirectory = configDirectory + '/';
if (!configDirectory.empty()) {
if (configDirectory.back() == '/' || configDirectory.back() == '\\')
impl->configDirectory = configDirectory;
else
impl->configDirectory = configDirectory + '/';
} else {
impl->configDirectory.clear();
}

// Required: segmentation
SegmentationPtr segmentation =
Expand Down

0 comments on commit f5a8a05

Please sign in to comment.