jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1105 from rbberger/truncate-file-path 

Avoid buffer overflow during errors with long filenames
This commit is contained in:
Axel Kohlmeyer 2018-09-09 01:30:14 -04:00 committed by GitHub
parent 075d366051 ba1c5d3191
commit 2faa34b2be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/error.cpp
View File

@ -75,7 +75,7 @@ void Error::universe_all(const char *file, int line, const char *str)
update->whichflag = 0;
char msg[100];
sprintf(msg, "ERROR: %s (%s:%d)\n", str, file, line);
snprintf(msg, 100, "ERROR: %s (%s:%d)\n", str, truncpath(file), line);
throw LAMMPSException(msg);
#else
MPI_Finalize();
@ -100,7 +100,7 @@ void Error::universe_one(const char *file, int line, const char *str)
update->whichflag = 0;
char msg[100];
sprintf(msg, "ERROR: %s (%s:%d)\n", str, file, line);
snprintf(msg, 100, "ERROR: %s (%s:%d)\n", str, truncpath(file), line);
throw LAMMPSAbortException(msg, universe->uworld);
#else
MPI_Abort(universe->uworld,1);
@ -151,7 +151,7 @@ void Error::all(const char *file, int line, const char *str)
update->whichflag = 0;
char msg[100];
sprintf(msg, "ERROR: %s (%s:%d)\n", str, file, line);
snprintf(msg, 100, "ERROR: %s (%s:%d)\n", str, truncpath(file), line);
if (universe->nworlds > 1) {
throw LAMMPSAbortException(msg, universe->uworld);
@ -201,7 +201,7 @@ void Error::one(const char *file, int line, const char *str)
update->whichflag = 0;
char msg[100];
sprintf(msg, "ERROR on proc %d: %s (%s:%d)\n", me, str, file, line);
snprintf(msg, 100, "ERROR on proc %d: %s (%s:%d)\n", me, str, truncpath(file), line);
throw LAMMPSAbortException(msg, world);
#else
MPI_Abort(world,1);