Fix crashes related to setting gl/prvalues mismatch

Discookie · Discookie · commit 32cfd3179792 · 2024-12-12T08:31:27.000Z
diff --git a/clang/lib/Analysis/FlowSensitive/Models/NullPointerAnalysisModel.cpp b/clang/lib/Analysis/FlowSensitive/Models/NullPointerAnalysisModel.cpp
@@ -224,7 +224,7 @@ Value *getValue(const Expr &Var, Environment &Env) {
 
   initializeRootValue(*RootValue, Env);
 
-  setGLValue(Var, *RootValue, Env);
+  setUnknownValue(Var, *RootValue, Env);
 
   return RootValue;
 }
@@ -396,6 +396,15 @@ void matchPtrArgFunctionExpr(const CallExpr *fncall,
     // Should be part of the framework, most likely.
     }
   }
+
+  if (fncall->getCallReturnType(*Result.Context)->isPointerType()) {
+    Value *RootValue = Env.createValue( 
+        fncall->getCallReturnType(*Result.Context));
+    if (!RootValue)
+      return;
+
+    setUnknownValue(*fncall, *RootValue, Env);
+  }
 }
 
 void matchAnyPointerExpr(const Expr *fncall,

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ Value *getValue(const Expr &Var, Environment &Env) {`
`224`	`224`
`225`	`225`	`initializeRootValue(*RootValue, Env);`
`226`	`226`
`227`		`- setGLValue(Var, *RootValue, Env);`
	`227`	`+ setUnknownValue(Var, *RootValue, Env);`
`228`	`228`
`229`	`229`	`return RootValue;`
`230`	`230`	`}`
`@@ -396,6 +396,15 @@ void matchPtrArgFunctionExpr(const CallExpr *fncall,`
`396`	`396`	`// Should be part of the framework, most likely.`
`397`	`397`	`}`
`398`	`398`	`}`
	`399`	`+`
	`400`	`+ if (fncall->getCallReturnType(*Result.Context)->isPointerType()) {`
	`401`	`+ Value *RootValue = Env.createValue(`
	`402`	`+ fncall->getCallReturnType(*Result.Context));`
	`403`	`+ if (!RootValue)`
	`404`	`+ return;`
	`405`	`+`
	`406`	`+ setUnknownValue(fncall, RootValue, Env);`
	`407`	`+ }`
`399`	`408`	`}`
`400`	`409`
`401`	`410`	`void matchAnyPointerExpr(const Expr *fncall,`