ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid segfault when catching command line flag errors with EXCEPTIONS enabled

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-04-05 23:24:43 -04:00
parent 3d7a4fb945
commit de0938da39
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/error.cpp
View File

@ -72,7 +72,9 @@ void Error::universe_all(const char *file, int line, const char *str)
#ifdef LAMMPS_EXCEPTIONS #ifdef LAMMPS_EXCEPTIONS
// allow commands if an exception was caught in a run // allow commands if an exception was caught in a run
update->whichflag = 0; // update may be NULL when catching command line errors
if (update) update->whichflag = 0;
char msg[100]; char msg[100];
snprintf(msg, 100, "ERROR: %s (%s:%d)\n", str, truncpath(file), line); snprintf(msg, 100, "ERROR: %s (%s:%d)\n", str, truncpath(file), line);
@ -97,7 +99,9 @@ void Error::universe_one(const char *file, int line, const char *str)
#ifdef LAMMPS_EXCEPTIONS #ifdef LAMMPS_EXCEPTIONS
// allow commands if an exception was caught in a run // allow commands if an exception was caught in a run
update->whichflag = 0; // update may be NULL when catching command line errors
if (update) update->whichflag = 0;
char msg[100]; char msg[100];
snprintf(msg, 100, "ERROR: %s (%s:%d)\n", str, truncpath(file), line); snprintf(msg, 100, "ERROR: %s (%s:%d)\n", str, truncpath(file), line);
@ -148,7 +152,9 @@ void Error::all(const char *file, int line, const char *str)
#ifdef LAMMPS_EXCEPTIONS #ifdef LAMMPS_EXCEPTIONS
// allow commands if an exception was caught in a run // allow commands if an exception was caught in a run
update->whichflag = 0; // update may be NULL when catching command line errors
if (update) update->whichflag = 0;
char msg[100]; char msg[100];
snprintf(msg, 100, "ERROR: %s (%s:%d)\n", str, truncpath(file), line); snprintf(msg, 100, "ERROR: %s (%s:%d)\n", str, truncpath(file), line);
@ -198,7 +204,9 @@ void Error::one(const char *file, int line, const char *str)
#ifdef LAMMPS_EXCEPTIONS #ifdef LAMMPS_EXCEPTIONS
// allow commands if an exception was caught in a run // allow commands if an exception was caught in a run
update->whichflag = 0; // update may be NULL when catching command line errors
if (update) update->whichflag = 0;
char msg[100]; char msg[100];
snprintf(msg, 100, "ERROR on proc %d: %s (%s:%d)\n", me, str, truncpath(file), line); snprintf(msg, 100, "ERROR on proc %d: %s (%s:%d)\n", me, str, truncpath(file), line);