From: David van der Spoel <spoel@xray.bmc.uu.se>
Date: Sun, 21 Oct 2012 10:06:32 +0000 (+0200)
Subject: Fixed Bug #593 about memory hole in trjcat.
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=c96a340cc890e93d1cec0adca2e2979db6fb8c1a;p=alexxy%2Fgromacs.git

Fixed Bug #593 about memory hole in trjcat.

Fixed by explicitly freeing memory for each frame. Tested to make
sure it does not crash.

Change-Id: Ic0e91b828a1e5a23f38690b4753092a31e6c4db4
---

diff --git a/src/tools/gmx_trjcat.c b/src/tools/gmx_trjcat.c
index 3f5296a141..63f2b8fbe5 100644
--- a/src/tools/gmx_trjcat.c
+++ b/src/tools/gmx_trjcat.c
@@ -128,10 +128,15 @@ static void scan_trj_files(char **fnms, int nfiles, real *readtime,
         }
 
         close_trj(status);
+        if (fr.bX)
+          sfree(fr.x);
+        if (fr.bV)
+          sfree(fr.v);
+        if (fr.bF)
+          sfree(fr.f);
     }
     fprintf(stderr,"\n");
 
-    sfree(fr.x);
 }
 
 static void sort_files(char **fnms, real *settime, int nfile)