Merge pull request #4950 from bmiklautz/cleanup_pr_4581p2

fix [cache/pointer]: add missing callback checks
This commit is contained in:
akallabeth 2018-10-19 13:00:51 +02:00 committed by GitHub
commit a263da002d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -43,7 +43,7 @@ static void pointer_free(rdpContext* context, rdpPointer* pointer)
{
if (pointer)
{
pointer->Free(context, pointer);
IFCALL(pointer->Free, context, pointer);
if (pointer->xorMaskData)
{
@ -139,7 +139,7 @@ static BOOL update_pointer_color(rdpContext* context,
pointer->lengthXorMask);
}
if (!pointer->New(context, pointer))
if (!IFCALLRESULT(TRUE, pointer->New, context, pointer))
goto out_fail;
if (!pointer_cache_put(cache->pointer, pointer_color->cacheIndex, pointer))
@ -199,7 +199,7 @@ static BOOL update_pointer_new(rdpContext* context,
pointer->lengthXorMask);
}
if (!pointer->New(context, pointer))
if (!IFCALLRESULT(TRUE, pointer->New, context, pointer))
goto out_fail;
if (!pointer_cache_put(cache->pointer, pointer_new->colorPtrAttr.cacheIndex,