From 6981b28a640805c96a79ce63290193aeee7da757 Mon Sep 17 00:00:00 2001
From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com>
Date: Thu, 19 Sep 2024 14:24:56 +0200
Subject: [PATCH] Fixed assignment of numeric 0 to pointer after inline
 expansion

---
 oscar64/InterCodeGenerator.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/oscar64/InterCodeGenerator.cpp b/oscar64/InterCodeGenerator.cpp
index f9b6c9c..b5d0e35 100644
--- a/oscar64/InterCodeGenerator.cpp
+++ b/oscar64/InterCodeGenerator.cpp
@@ -2368,6 +2368,18 @@ InterCodeGenerator::ExValue InterCodeGenerator::TranslateExpression(Declaration*
 				vr = ToValue(proc, exp, block, inlineMapper, vr);
 			}
 
+			if (exp->mLeft->mDecType->mType == DT_TYPE_POINTER && vr.mType->mType == DT_TYPE_INTEGER)
+			{
+				Expression* er = exp->mRight;
+				while (er && er->mType == EX_COMMA)
+					er = er->mRight;
+				if (er && er->mType == EX_CONSTANT && er->mDecValue->mType == DT_CONST_INTEGER && er->mDecValue->mInteger == 0)
+				{
+					mErrors->Error(exp->mLocation, EWARN_NUMERIC_0_USED_AS_NULLPTR, "Numeric 0 used for nullptr");
+					vr = CoerceType(proc, exp, block, inlineMapper, vr, exp->mLeft->mDecType);
+				}
+			}
+
 			if (exp->mToken == TK_ASSIGN || !(vl.mType->mType == DT_TYPE_POINTER && vr.mType->IsIntegerType() && (exp->mToken == TK_ASSIGN_ADD || exp->mToken == TK_ASSIGN_SUB)))
 			{
 				if (!vl.mType->CanAssign(vr.mType))