LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

added some more sanity checks for any2many.

Browse Source
This commit is contained in:
suter_a
2025-11-12 13:13:40 +01:00
parent d38fb078f9
commit 5ae66a0614
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/any2many.cpp
View File

@@ -423,7 +423,7 @@ int main(int argc, char *argv[])
} else if (!strcmp(argv[i], "-z")) { // filter out if compression is whished } else if (!strcmp(argv[i], "-z")) { // filter out if compression is whished
if (i+2 < argc) { if (i+2 < argc) {
if ((argv[i+1][0] == '-') || (argv[i+2][0] == '-')) { if ((argv[i+1][0] == '-') || (argv[i+2][0] == '-')) {
std::cerr << std::endl << ">> any2many **ERROR** found invalid template in option '-t'" << std::endl; std::cerr << std::endl << ">> any2many **ERROR** found invalid template in option '-z'" << std::endl;
show_syntax = true; show_syntax = true;
break; break;
} }
@@ -499,13 +499,14 @@ int main(int argc, char *argv[])
// read startup file // read startup file
char startup_path_name[128]; char startup_path_name[128];
memset(startup_path_name, '\0', sizeof(startup_path_name));
std::unique_ptr<TSAXParser> saxParser = std::make_unique<TSAXParser>(); std::unique_ptr<TSAXParser> saxParser = std::make_unique<TSAXParser>();
std::unique_ptr<PStartupHandler> startupHandler = std::make_unique<PStartupHandler>(); std::unique_ptr<PStartupHandler> startupHandler = std::make_unique<PStartupHandler>();
if (!startupHandler->StartupFileFound()) { if (!startupHandler->StartupFileFound()) {
std::cerr << std::endl << ">> any2many **WARNING** couldn't find " << startupHandler->GetStartupFilePath().Data(); std::cerr << std::endl << ">> any2many **WARNING** couldn't find " << startupHandler->GetStartupFilePath().Data();
std::cerr << std::endl; std::cerr << std::endl;
} else { } else {
strcpy(startup_path_name, startupHandler->GetStartupFilePath().Data()); strncpy(startup_path_name, startupHandler->GetStartupFilePath().Data(), sizeof(startup_path_name));
saxParser->ConnectToHandler("PStartupHandler", startupHandler.get()); saxParser->ConnectToHandler("PStartupHandler", startupHandler.get());
//status = saxParser->ParseFile(startup_path_name); //status = saxParser->ParseFile(startup_path_name);
// parsing the file as above seems to lead to problems in certain environments; // parsing the file as above seems to lead to problems in certain environments;