Skip to content

More NULL protection #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FreddieAkeroyd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

More NULL protection #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions icpconfigApp/src/icpconfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,18 +346,20 @@ static void loadTestMacros(MAC_HANDLE *h, const std::string& config_name, const
testrecsim = macEnvExpand("$(TESTRECSIM=)");
testnosim = macEnvExpand("$(TESTNOSIM=)");

var_dir = macEnvExpand("$(ICPVARDIR)");
var_dir = macEnvExpand("$(ICPVARDIR=)");

testdevsim_is_empty = testdevsim.size() == 0;
testrecsim_is_empty = testrecsim.size() == 0;
testnosim_is_empty = testnosim.size() == 0;

if ((!testdevsim_is_empty || !testrecsim_is_empty || !testnosim_is_empty) && (var_dir.size() == 0)) {
errlogPrintf("icpconfigLoad: failed (ICPVARDIR environment variable not set - cannot load test macros)\n");
} else if ((!testdevsim_is_empty || !testrecsim_is_empty || !testnosim_is_empty)) {
loadMacroFile(h, var_dir + "/tmp/test_macros.txt", config_name, config_root, ioc_name, ioc_group, false, false, verbose);
simulate = true;
setValue(h, "SIMULATE", "1", "{simulation mode for tests}");
if (!testdevsim_is_empty || !testrecsim_is_empty || !testnosim_is_empty) {
if (var_dir.size() == 0) {
errlogPrintf("icpconfigLoad: failed (ICPVARDIR environment variable not set - cannot load test macros)\n");
} else {
loadMacroFile(h, var_dir + "/tmp/test_macros.txt", config_name, config_root, ioc_name, ioc_group, false, false, verbose);
simulate = true;
setValue(h, "SIMULATE", "1", "{simulation mode for tests}");
}
}

if (!testdevsim_is_empty) {
Expand Down Expand Up @@ -402,12 +404,12 @@ static MAC_HANDLE* icpconfigLoadMain(const std::string& config_name, const std::
}
if (options == 0)
{
options = atoi(macEnvExpand("$(ICPCONFIGOPTIONS)"));
options = atoi(macEnvExpand("$(ICPCONFIGOPTIONS=)"));
}
bool verbose = (options & VerboseOutput);
quiet = (options & QuietOutput);
std::string configName;
std::string config_root = macEnvExpand("$(ICPCONFIGROOT)");
std::string config_root = macEnvExpand("$(ICPCONFIGROOT=)");
if (!quiet)
{
printf("icpconfigLoad: ioc \"%s\" group \"%s\" options 0x%x host \"%s\"\n", ioc_name.c_str(), ioc_group.c_str(), options, config_host);
Expand All @@ -424,7 +426,7 @@ static MAC_HANDLE* icpconfigLoadMain(const std::string& config_name, const std::
setValue(h, "DISABLE", "0", "{initial default}");
setValue(h, "DEVSIM", "0", "{initial default}");
setValue(h, "RECSIM", "0", "{initial default}");
if (config_name.size() == 0)
if (config_name.size() == 0 && config_root.size() != 0)
{
configName = readFile(config_root + "/last_config.txt");
}
Expand Down Expand Up @@ -572,6 +574,10 @@ static int loadDefaultMacros(MAC_HANDLE *h, const std::string& config_name){
printf("icpconfigLoad: No $(IOC) macro, skipping load defaults\n");
return 0;
}
if (macEnvExpand("$(TOP)") == NULL){
printf("icpconfigLoad: No $(TOP) macro, skipping load defaults\n");
return 0;
}
std::string configXMLDir = std::string(macEnvExpand("$(IOC)")) +"/config.xml";
std::string confXML = std::string(macEnvExpand("$(TOP)")) +"/iocBoot/" + configXMLDir;
pugi::xml_parse_result result = confXMLDoc.load_file(confXML.c_str());
Expand Down