fix daca codeblocks crash (danmar#1968)

IOBYTE · danmar · commit a05dfc915078 · 2019-07-09T16:04:22.000+02:00
* fix daca codeblocks crash

* fix the cause of the missing scope
diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
@@ -247,7 +247,7 @@
   <define name="DECLARE_EXPORTED_EVENT_TYPE(expdecl, name, value)" value=""/>
   <define name="DECLARE_EVENT_TYPE(name, value)" value=""/>
   <define name="DECLARE_LOCAL_EVENT_TYPE(name, value)" value=""/>
-  <define name="DEFINE_EVENT_TYPE(name)" value="const wxEventType name = wxNewEventType()"/>
+  <define name="DEFINE_EVENT_TYPE(name)" value="const wxEventType name = wxNewEventType();"/>
   <define name="DEFINE_LOCAL_EVENT_TYPE(name)" value=""/>
   <define name="WX_DECLARE_STRING_HASH_MAP(name, value)" value=""/>
   <define name="DECLARE_LOCAL_EVENT_TYPE(name, value)" value=""/>
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -355,7 +355,7 @@ void CheckMemoryLeak::mismatchAllocDealloc(const std::list<const Token *> &calls
 
 CheckMemoryLeak::AllocType CheckMemoryLeak::functionReturnType(const Function* func, std::list<const Function*> *callstack) const
 {
-    if (!func || !func->hasBody())
+    if (!func || !func->hasBody() || !func->functionScope)
         return No;
 
     // Get return pointer..

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ void CheckMemoryLeak::mismatchAllocDealloc(const std::list<const Token *> &calls`
`355`	`355`
`356`	`356`	`CheckMemoryLeak::AllocType CheckMemoryLeak::functionReturnType(const Function* func, std::list<const Function> callstack) const`
`357`	`357`	`{`
`358`		`- if (!func \|\| !func->hasBody())`
	`358`	`+ if (!func \|\| !func->hasBody() \|\| !func->functionScope)`
`359`	`359`	`return No;`
`360`	`360`
`361`	`361`	`// Get return pointer..`