Changeset 38339 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_M.c

Timestamp:

May 30, 2015, 1:49:15 PM (11 years ago)

Author:

eugene

Message:

error handling

File:

• branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_M.c (modified) (3 diffs)

branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_M.c

@@ -261 +261 @@
 
     zdata = gfits_varlength_column_pointer (ftable, &zdef, row, &Nzdata);
-    if (!zdata) return (FALSE);
+    if (!zdata) ESCAPE;
 
     // XXX not certain this is the correct place to do the swap (or if zdata_pixsize is
@@ -267 +267 @@
 
     if (strcasecmp(cmptype, "GZIP_1")) {
-      if (!gfits_byteswap_zdata (zdata, Nzdata, zdata_pixsize)) return (FALSE);
+      if (!gfits_byteswap_zdata (zdata, Nzdata, zdata_pixsize)) ESCAPE;
     }
 
     // gfits_uncompress_data uncompresses from zdata to the temporary output buffer which must be allocated
     // XXX the tile must not be > 2GB
-    if (!gfits_uncompress_data ((char *)zdata, Nzdata, cmptype, optname, optvalue, Noptions, out, &Nout, odata_pixsize)) return (FALSE);
+    if (!gfits_uncompress_data ((char *)zdata, Nzdata, cmptype, optname, optvalue, Noptions, out, &Nout, odata_pixsize)) ESCAPE;
 
     // copy the uncompressed pixels into their correct locations            
-    if (!gfits_distribute_data (matrix, odata_pixsize, out, Nout, otile, oblank, ztile, zblank, zscale, zzero)) return (FALSE);
+    if (!gfits_distribute_data (matrix, odata_pixsize, out, Nout, otile, oblank, ztile, zblank, zscale, zzero)) ESCAPE;
 
     // update the tile counters, carrying to the next dimension if needed
@@ -287 +287 @@
     }
   }
+
+  FREE (ztile);
+  if (optname != NULL) {
+    for (j = 0; j < Noptions; j++) {
+      FREE (optname[j]);
+      FREE (optvalue[j]);
+    }
+    FREE (optname);
+    FREE (optvalue);
+  }
+  FREE (out);
+  FREE (otile); 
+  FREE (ntile); 
   return (TRUE);
 }