Merge pull request #10742 from teijokinnunen/cthunk_free_fix

0xc0170 · web-flow · commit eb1202921514 · 2019-06-09T18:16:56.000+01:00
CThunk: Fix assertion when CThunk object is destroyed
diff --git a/platform/CThunk.h b/platform/CThunk.h
@@ -64,8 +64,10 @@ class CThunk: public CThunkBase {
 
     ~CThunk()
     {
-        cthunk_free(_entry);
-        _entry = NULL;
+        if (_entry != NULL) {
+            cthunk_free(_entry);
+            _entry = NULL;
+        }
     }
 
     inline CThunk(T *instance, CCallbackSimple callback)

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,10 @@ class CThunk: public CThunkBase {`
`64`	`64`
`65`	`65`	`~CThunk()`
`66`	`66`	`{`
`67`		`- cthunk_free(_entry);`
`68`		`- _entry = NULL;`
	`67`	`+ if (_entry != NULL) {`
	`68`	`+ cthunk_free(_entry);`
	`69`	`+ _entry = NULL;`
	`70`	`+ }`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`inline CThunk(T *instance, CCallbackSimple callback)`