Fixed nullptr dereferencing and reading uninitialized vars.

jgu222 · sys_zuul · commit 294fb63eb26c · 2020-07-28T15:02:22.000-07:00
Change-Id: I5f8c36969c9341a49e07006ea4154d00d0c0ef55
diff --git a/visa/VISAKernelImpl.cpp b/visa/VISAKernelImpl.cpp
@@ -1501,9 +1501,10 @@ int VISAKernelImpl::AddAttributeToVarGeneric(CISA_GEN_VAR *decl, const char* var
     attr->nameIndex = addStringPool(std::string(varName));
     attr->isInt = Attributes::isIntNonKernelAttribute(Attributes::getAttributeID(varName));
 
+    attr->size = (uint8_t)size;
     if (attr->isInt)
     {
-        attr->value.intVal = *((int*)val);
+        attr->value.intVal = val ? *((int*)val) : 0;
         assert(attr->size <= 4 && "Int attribute has a value of 4 bytes at most!");
     }
     else
@@ -1512,7 +1513,6 @@ int VISAKernelImpl::AddAttributeToVarGeneric(CISA_GEN_VAR *decl, const char* var
         memcpy_s(temp, size, val, size);
         attr->value.stringVal = (char*)temp;
     }
-    attr->size = (uint8_t)size;
 
     switch(decl->type)
     {

Original file line number	Diff line number	Diff line change
`@@ -1501,9 +1501,10 @@ int VISAKernelImpl::AddAttributeToVarGeneric(CISA_GEN_VAR decl, const char var`
`1501`	`1501`	`attr->nameIndex = addStringPool(std::string(varName));`
`1502`	`1502`	`attr->isInt = Attributes::isIntNonKernelAttribute(Attributes::getAttributeID(varName));`
`1503`	`1503`
	`1504`	`+ attr->size = (uint8_t)size;`
`1504`	`1505`	`if (attr->isInt)`
`1505`	`1506`	`{`
`1506`		`- attr->value.intVal = ((int)val);`
	`1507`	`+ attr->value.intVal = val ? ((int)val) : 0;`
`1507`	`1508`	`assert(attr->size <= 4 && "Int attribute has a value of 4 bytes at most!");`
`1508`	`1509`	`}`
`1509`	`1510`	`else`
`@@ -1512,7 +1513,6 @@ int VISAKernelImpl::AddAttributeToVarGeneric(CISA_GEN_VAR decl, const char var`
`1512`	`1513`	`memcpy_s(temp, size, val, size);`
`1513`	`1514`	`attr->value.stringVal = (char*)temp;`
`1514`	`1515`	`}`
`1515`		`- attr->size = (uint8_t)size;`
`1516`	`1516`
`1517`	`1517`	`switch(decl->type)`
`1518`	`1518`	`{`