zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 21:51:09 +00:00
Code Issues Projects Releases Packages Wiki 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
parent e8c2444ddd
commit a102807737
2 changed files with 2 additions and 4 deletions
Show stats 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); AddrKonst *locp = AddressConstantMap.CheckKey(ptr);
if (locp != NULL) if (locp != NULL)
{ {
// There should only be one tag associated with a memory location. // There should only be one tag associated with a memory location. Exceptions are made for null pointers that got allocated through constant arrays.
assert(locp->Tag == tag); assert(ptr == nullptr || locp->Tag == tag);
return locp->KonstNum; return locp->KonstNum;
} }
else else

2
src/v_draw.cpp
View file

@ -523,8 +523,6 @@ bool DCanvas::ParseDrawTextureTags (FTexture *img, double x, double y, DWORD tag
// doubles when passed as function arguments.) // doubles when passed as function arguments.)
while (tag != TAG_DONE) while (tag != TAG_DONE)
{ {
DWORD data;
switch (tag) switch (tag)
{ {
default: default: