From f864584bcecb258004960f25e476ea1adf925556 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Fri, 11 May 2018 00:43:09 -0400 Subject: [PATCH] correct small bugs found by coverity scan static code analysis - in fix rigid, rigid/small, and poems, a string argument was incorrectly assigned to a %d format - plug two small memory leaks in fix bond/react --- src/POEMS/fix_poems.cpp | 2 +- src/RIGID/fix_rigid.cpp | 2 +- src/RIGID/fix_rigid_small.cpp | 2 +- src/USER-MISC/fix_bond_react.cpp | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/POEMS/fix_poems.cpp b/src/POEMS/fix_poems.cpp index edc72ea70c..2c2fefb250 100644 --- a/src/POEMS/fix_poems.cpp +++ b/src/POEMS/fix_poems.cpp @@ -369,7 +369,7 @@ void FixPOEMS::init() if (pflag && (modify->fmask[i] & POST_FORCE) && !modify->fix[i]->rigid_flag) { char str[128]; - sprintf(str,"Fix %d alters forces after fix poems",modify->fix[i]->id); + sprintf(str,"Fix %s alters forces after fix poems",modify->fix[i]->id); error->warning(FLERR,str); } } diff --git a/src/RIGID/fix_rigid.cpp b/src/RIGID/fix_rigid.cpp index 07ebf884c7..7104d30849 100644 --- a/src/RIGID/fix_rigid.cpp +++ b/src/RIGID/fix_rigid.cpp @@ -730,7 +730,7 @@ void FixRigid::init() if (rflag && (modify->fmask[i] & POST_FORCE) && !modify->fix[i]->rigid_flag) { char str[128]; - sprintf(str,"Fix %d alters forces after fix rigid",modify->fix[i]->id); + sprintf(str,"Fix %s alters forces after fix rigid",modify->fix[i]->id); error->warning(FLERR,str); } } diff --git a/src/RIGID/fix_rigid_small.cpp b/src/RIGID/fix_rigid_small.cpp index d0cb596c82..c1de89efc7 100644 --- a/src/RIGID/fix_rigid_small.cpp +++ b/src/RIGID/fix_rigid_small.cpp @@ -569,7 +569,7 @@ void FixRigidSmall::init() if (rflag && (modify->fmask[i] & POST_FORCE) && !modify->fix[i]->rigid_flag) { char str[128]; - sprintf(str,"Fix %d alters forces after fix rigid",modify->fix[i]->id); + sprintf(str,"Fix %s alters forces after fix rigid",modify->fix[i]->id); error->warning(FLERR,str); } } diff --git a/src/USER-MISC/fix_bond_react.cpp b/src/USER-MISC/fix_bond_react.cpp index 9882c29fed..4120ce0df5 100644 --- a/src/USER-MISC/fix_bond_react.cpp +++ b/src/USER-MISC/fix_bond_react.cpp @@ -1155,6 +1155,8 @@ void FixBondReact::make_a_guess() for (int i = 0; i < atom->ntypes; i++) { if (mol_ntypes[i] != lcl_ntypes[i]) { status = GUESSFAIL; + delete [] mol_ntypes; + delete [] lcl_ntypes; return; } }