From 3ca93f10b3330a28f8b27ceac6b5abb333ff5924 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 4 Mar 2020 13:57:38 -0500 Subject: [PATCH] don't run atof() on a NULL pointer in case a potential file has an empty line --- src/MANYBODY/pair_adp.cpp | 2 +- src/MANYBODY/pair_eam.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MANYBODY/pair_adp.cpp b/src/MANYBODY/pair_adp.cpp index 64c778659c..e730466fcb 100644 --- a/src/MANYBODY/pair_adp.cpp +++ b/src/MANYBODY/pair_adp.cpp @@ -927,7 +927,7 @@ void PairADP::grab(FILE *fp, char *filename, int n, double *list) while (i < n) { utils::sfgets(FLERR,line,MAXLINE,fp,filename,error); ptr = strtok(line," \t\n\r\f"); - list[i++] = atof(ptr); + if (ptr) list[i++] = atof(ptr); while ((ptr = strtok(NULL," \t\n\r\f"))) list[i++] = atof(ptr); } } diff --git a/src/MANYBODY/pair_eam.cpp b/src/MANYBODY/pair_eam.cpp index d1b864d9e4..a1bc6e1eb4 100644 --- a/src/MANYBODY/pair_eam.cpp +++ b/src/MANYBODY/pair_eam.cpp @@ -797,7 +797,7 @@ void PairEAM::grab(FILE *fptr, int n, double *list) while (i < n) { utils::sfgets(FLERR,line,MAXLINE,fptr,NULL,error); ptr = strtok(line," \t\n\r\f"); - list[i++] = atof(ptr); + if (ptr) list[i++] = atof(ptr); while ((ptr = strtok(NULL," \t\n\r\f"))) list[i++] = atof(ptr); } }