Changeset 39501

Timestamp:

Mar 31, 2016, 6:32:25 AM (10 years ago)

Author:

eugene

Message:

plug a memory leak; handle a failure condition gracefully

Location:

trunk/ppImage/src

Files:

• ppImageDetrendReadout.c (modified) (2 diffs)
• ppImageLoop.c (modified) (1 diff)

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -44 +44 @@
     {
       // XXX test for GPC1? or CAN_HAVE_VIDEO in camera config?
+      bool status = false;
       if (!input) goto done_video_check;
       if (!input->parent) goto done_video_check;
@@ -49 +50 @@
       if (!input->parent->parent->hdu) goto done_video_check;
       if (!input->parent->parent->hdu->header) goto done_video_check;
-      if (psMetadataLookupStr(NULL,input->parent->parent->hdu->header,"CELLMODE")) {
+      char *ptr = psMetadataLookupStr(&status,input->parent->parent->hdu->header,"CELLMODE");
+      if (status) {
         psLogMsg ("ppImage.detrend", PS_LOG_DETAIL, "VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask);
-        char *Vptr = strchr(psMetadataLookupStr(NULL,input->parent->parent->hdu->header,"CELLMODE"),'V');
+        char *Vptr = strchr(ptr,'V');
         if (Vptr) {
           hasVideo = options->hasVideo = true;

trunk/ppImage/src/ppImageLoop.c

@@ -7 +7 @@
 #define ESCAPE(MESSAGE) { \
   psError(PS_ERR_UNKNOWN, false, MESSAGE); \
+  pmFPAfileIOChecks(config, view, PM_FPA_AFTER); \
   psFree(view); \
+  psFree(stats); \
   pmFPAfileFreeSetStrict(false); \
   return false; \