Track variable for checking null pointer assigned from function call only if function return pointer.

Update METHOD_TYPE for always parse function return type.

1 files changed, 16 insertions, 0 deletions

diff --git a/src/analysis/expression.cpp b/src/analysis/expression.cpp
index 7c5194e..b6e00ca 100644
--- a/src/analysis/expression.cpp
+++ b/src/analysis/expression.cpp
@@ -59,6 +59,8 @@
 #include "nodes/ref/indirect_ref.h"
 #include "nodes/ref/objtype_ref.h"
 
+#include "nodes/type/method_type.h"
+
 #include <set>
 
 #include "localconsts.h"
@@ -103,6 +105,10 @@ bool isPointerArg(Node *node)
         if (skipNop(var->varType) == POINTER_TYPE)
             return true;
     }
+    else if (node == COMPONENT_REF)
+    {
+        return true;
+    }
     return false;
 }
 
@@ -752,6 +758,16 @@ bool handleSetVarToFunction(const std::string &var,
     if (!func->functionType)
         return false;
 
+    Node *returnType;
+    if (func->functionType == FUNCTION_TYPE)
+        returnType = static_cast<FunctionTypeNode*>(func->functionType)->returnType;
+    else if (func->functionType == METHOD_TYPE)
+        returnType = static_cast<MethodTypeNode*>(func->functionType)->returnType;
+    else
+        return false;
+    if (returnType != POINTER_TYPE)
+        return false;
+
     if (findTreeListPurpose(static_cast<TreeListNode*>(func->functionType->attribute),
         "returns_nonnull"))
     {   // function have attribute returns_nonnull. This mean result cant be null