Fix Segmentation fault in RNLDeinit().

xiaoxial · xiaoxial · commit bb2bcd54b374 · 2025-01-15T10:32:32.000+08:00
Signed-off-by: Xiaoxia Liang &lt;xiaoxia.liang@intel.com&gt;
diff --git a/Library/Raisr.cpp b/Library/Raisr.cpp
@@ -1856,15 +1856,17 @@ RNLERRORTYPE RNLDeinit()
 
     for (int threadIdx = 0; threadIdx < gThreadCount; threadIdx++)
     {
-	if (gIppCtx.specY[threadIdx])
+	if (gIppCtx.specY && gIppCtx.specY[threadIdx])
 	    ippsFree(gIppCtx.specY[threadIdx]);
-        if (gIppCtx.pbufferY[threadIdx])
+        if (gIppCtx.pbufferY && gIppCtx.pbufferY[threadIdx])
 	    ippsFree(gIppCtx.pbufferY[threadIdx]);
         for (int i = 0; i < gPasses; i++)
         {
-            SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].inYUpscaled);
-            SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].inYUpscaled32f);
-            SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].raisr32f);
+            if (gIppCtx.segZones && gIppCtx.segZones[i]) {
+                SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].inYUpscaled);
+                SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].inYUpscaled32f);
+                SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].raisr32f);
+	   }
         }
     }
     SAFE_DELETE(gPool);

Original file line number	Diff line number	Diff line change
`@@ -1856,15 +1856,17 @@ RNLERRORTYPE RNLDeinit()`
`1856`	`1856`
`1857`	`1857`	`for (int threadIdx = 0; threadIdx < gThreadCount; threadIdx++)`
`1858`	`1858`	`{`
`1859`		`- if (gIppCtx.specY[threadIdx])`
	`1859`	`+ if (gIppCtx.specY && gIppCtx.specY[threadIdx])`
`1860`	`1860`	`ippsFree(gIppCtx.specY[threadIdx]);`
`1861`		`- if (gIppCtx.pbufferY[threadIdx])`
	`1861`	`+ if (gIppCtx.pbufferY && gIppCtx.pbufferY[threadIdx])`
`1862`	`1862`	`ippsFree(gIppCtx.pbufferY[threadIdx]);`
`1863`	`1863`	`for (int i = 0; i < gPasses; i++)`
`1864`	`1864`	`{`
`1865`		`- SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].inYUpscaled);`
`1866`		`- SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].inYUpscaled32f);`
`1867`		`- SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].raisr32f);`
	`1865`	`+ if (gIppCtx.segZones && gIppCtx.segZones[i]) {`
	`1866`	`+ SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].inYUpscaled);`
	`1867`	`+ SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].inYUpscaled32f);`
	`1868`	`+ SAFE_ARR_DELETE(gIppCtx.segZones[i][threadIdx].raisr32f);`
	`1869`	`+ }`
`1868`	`1870`	`}`
`1869`	`1871`	`}`
`1870`	`1872`	`SAFE_DELETE(gPool);`