Fix dxilconv crash when initialization fails (#3254)

hekota · web-flow · commit a39e52dd81d8 · 2020-11-11T15:10:18.000-08:00
diff --git a/lib/DxcSupport/dxcmem.cpp b/lib/DxcSupport/dxcmem.cpp
@@ -58,12 +58,12 @@ IMalloc *DxcGetThreadMallocNoRef() throw() {
 }
 
 void DxcClearThreadMalloc() throw() {
-  IMalloc *pMalloc = DxcGetThreadMallocNoRef();
   if (g_ThreadMallocTls != nullptr) {
+    IMalloc *pMalloc = DxcGetThreadMallocNoRef();
     g_ThreadMallocTls->erase();
-  }
-  if (pMalloc != nullptr) {
-    pMalloc->Release();
+    if (pMalloc != nullptr) {
+      pMalloc->Release();
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,12 @@ IMalloc *DxcGetThreadMallocNoRef() throw() {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`void DxcClearThreadMalloc() throw() {`
`61`		`- IMalloc *pMalloc = DxcGetThreadMallocNoRef();`
`62`	`61`	`if (g_ThreadMallocTls != nullptr) {`
	`62`	`+ IMalloc *pMalloc = DxcGetThreadMallocNoRef();`
`63`	`63`	`g_ThreadMallocTls->erase();`
`64`		`- }`
`65`		`- if (pMalloc != nullptr) {`
`66`		`- pMalloc->Release();`
	`64`	`+ if (pMalloc != nullptr) {`
	`65`	`+ pMalloc->Release();`
	`66`	`+ }`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`