Changeset 39499 for trunk/psModules/src/detrend/pmOverscan.c

Timestamp:

Mar 31, 2016, 6:29:20 AM (10 years ago)

Author:

eugene

Message:

fix possible double-free in overscan subtraction (scalar case)

File:

• trunk/psModules/src/detrend/pmOverscan.c (modified) (3 diffs)

trunk/psModules/src/detrend/pmOverscan.c

@@ -228 +228 @@
         psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_SIG", PS_META_REPLACE, "Overscan stdev", NAN);
 
+        // NOTE psBinaryOp frees arg2 if it is a scalar
         (void)psBinaryOp(input->image, input->image, "-", psScalarAlloc((float)overscanOpts->value, PS_TYPE_F32));
 
@@ -296 +297 @@
 
         psScalar *reducedScalar = psScalarAlloc(reduced, PS_TYPE_F32);
-        (void)psBinaryOp (image, image, "-", reducedScalar);
+        psBinaryOp (image, image, "-", psMemIncrRefCounter(reducedScalar)); // NOTE: psBinaryOp frees arg2 if it a scalar, so we need to bump to re-use
 
         // subtract the measured value from each overscan region as well
@@ -302 +303 @@
         overscan = NULL;   // Overscan image from iterator
         while ((overscan = psListGetAndIncrement(iter))) {
-          (void)psBinaryOp(overscan, overscan, "-", reducedScalar);
+          psBinaryOp(overscan, overscan, "-", psMemIncrRefCounter(reducedScalar)); // NOTE: psBinaryOp frees arg2 if it a scalar, so we need to bump to re-use
         }
         psFree(iter);