Ticket #1130: patch.diff

source/Lib/TLibCommon/TComPicSym.cpp

@@ -137 +137 @@
   }
   m_apcTComSlice = NULL;
   
-  for (Int i = 0; i < m_uiNumCUsInFrame; i++)
+  if (m_apcTComDataCU)
   {
-    m_apcTComDataCU[i]->destroy();
-    delete m_apcTComDataCU[i];
-    m_apcTComDataCU[i] = NULL;
+    for (Int i = 0; i < m_uiNumCUsInFrame; i++)
+    {
+      m_apcTComDataCU[i]->destroy();
+      delete m_apcTComDataCU[i];
+      m_apcTComDataCU[i] = NULL;
+    }
+    delete [] m_apcTComDataCU;
+    m_apcTComDataCU = NULL;
   }
-  delete [] m_apcTComDataCU;
-  m_apcTComDataCU = NULL;
 
-  for(Int i = 0; i < (m_iNumColumnsMinus1+1)*(m_iNumRowsMinus1+1); i++ )
+  if (m_apcTComTile)
   {
-    delete m_apcTComTile[i];
+    for(Int i = 0; i < (m_iNumColumnsMinus1+1)*(m_iNumRowsMinus1+1); i++ )
+    {
+      delete m_apcTComTile[i];
+    }
+    delete [] m_apcTComTile;
+    m_apcTComTile = NULL;
   }
-  delete [] m_apcTComTile;
 
-  m_apcTComTile = NULL;
+  if (m_puiCUOrderMap)
+  {
+    delete [] m_puiCUOrderMap;
+    m_puiCUOrderMap = NULL;
+  }
 
-  delete [] m_puiCUOrderMap;
-  m_puiCUOrderMap = NULL;
+  if (m_puiTileIdxMap)
+  {
+    delete [] m_puiTileIdxMap;
+    m_puiTileIdxMap = NULL;
+  }
 
-  delete [] m_puiTileIdxMap;
-  m_puiTileIdxMap = NULL;
+  if (m_puiInverseCUOrderMap)
+  {
+    delete [] m_puiInverseCUOrderMap;
+    m_puiInverseCUOrderMap = NULL;
+  }
 
-  delete [] m_puiInverseCUOrderMap;
-  m_puiInverseCUOrderMap = NULL;
-  
   if (m_saoParam)
   {
     TComSampleAdaptiveOffset::freeSaoParam(m_saoParam);