OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- atags for null pointers have no meaning so do not assert on them.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-04 19:36:39 +01:00
commit a102807737
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/scripting/vm/vmbuilder.cpp
View file

@ -281,8 +281,8 @@ unsigned VMFunctionBuilder::GetConstantAddress(void *ptr, VM_ATAG tag)
AddrKonst *locp = AddressConstantMap.CheckKey(ptr);
if (locp != NULL)
{
// There should only be one tag associated with a memory location.
assert(locp->Tag == tag);
// There should only be one tag associated with a memory location. Exceptions are made for null pointers that got allocated through constant arrays.
assert(ptr == nullptr || locp->Tag == tag);
return locp->KonstNum;
}
else