all test data runs without error in valgrind

Author: bruceravel

c/test_valgrind.pl

@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+
+print "Testing good files\n";
+foreach my $file (qw(co_metal_rt.xdi
+		     cu_metal_10K.xdi
+		     cu_metal_rt.xdi
+		     fe2o3_rt.xdi
+		     fe3c_rt.xdi
+		     fe_metal_rt.xdi
+		     fen_rt.xdi
+		     feo_rt1.xdi
+		     ni_metal_rt.xdi
+		     nonxafs_1d.xdi
+		     nonxafs_2d.xdi
+		     pt_metal_rt.xdi
+		     se_na2so4_rt.xdi
+		     se_znse_rt.xdi
+		     zn_znse_rt.xdi
+		   )) {
+  my $command = "valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all ./xdi_reader ../baddata/$file 2>&1";
+  my $x = `$command`;
+  printf "\t%-17s:  ", $file;
+  if ($x =~ m{All heap blocks were freed}) {
+    print "ok\n";
+  } else {
+    print "not ok\n";
+  };
+
+};
+
+
+print "\nTesting bad files\n";
+foreach my $i (0 .. 29) {
+  my $n = sprintf("%2.2d", $i);
+  my $command = "valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all ./xdi_reader ../baddata/bad_$n.xdi 2>&1";
+  #print $command, $/;
+  my $x = `$command`;
+  printf "\tbad_%s.xdi:  ", $n;
+  if ($x =~ m{All heap blocks were freed}) {
+    print "ok\n";
+  } else {
+    print "not ok\n";
+  };
+};
+
+
+

c/xdifile.c

@@ -431,7 +431,17 @@ XDI_readfile(char *filename, XDIFile *xdifile) {
   xdifile->array = calloc(ncols, sizeof(double *));
   for (j = 0; j < ncols; j++) {
     xdifile->array[j] = calloc(npts_+1, sizeof(double));
-    if (0 != xdi_strtod(words[j], &dval)) {  return ERR_NONNUMERIC;}
+    if (0 != xdi_strtod(words[j], &dval)) {
+      free(line);
+      free(outer_arr);
+      free(outer_pts);
+      xdifile->narrays = ncols;
+      xdifile->nmetadata = ndict+1;
+      for (j=0; j<=ilen; j++) {
+	free(textlines[j]);
+      }
+      return ERR_NONNUMERIC;
+    }
     xdifile->array[j][0] = dval;
   }
 
@@ -465,15 +475,27 @@ XDI_readfile(char *filename, XDIFile *xdifile) {
       /* COPY_STRING(line, textlines[i]); */
       icol = make_words(textlines[i], words, MAX_WORDS);
       if (icol != ncols) {
+	free(line);
 	free(outer_arr);
 	free(outer_pts);
+	xdifile->narrays = ncols;
+	xdifile->nmetadata = ndict+1;
+	for (j=0; j<=ilen; j++) {
+	  free(textlines[j]);
+	}
 	return ERR_NCOLS_CHANGE;
       }
       icol = min(ncols, icol);
       for (j = 0; j < icol; j++) {
 	if (0 != xdi_strtod(words[j], &dval)) {
+	  free(line);
 	  free(outer_arr);
 	  free(outer_pts);
+	  xdifile->narrays = ncols;
+	  xdifile->nmetadata = ndict+1;
+	  for (j=0; j<=ilen; j++) {
+	    free(textlines[j]);
+	  }
 	  return ERR_NONNUMERIC;
 	}
 	xdifile->array[j][ipt] = dval;