From dc658f85331762c2d543fc689b08cdd3c73cc499 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Fri, 27 Jul 2018 08:42:53 -0400 Subject: [PATCH] NewWindow2 checks for null title/color/control lists. --- control.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/control.c b/control.c index 34ca80f..04d4ac4 100644 --- a/control.c +++ b/control.c @@ -173,16 +173,18 @@ void check_rWindParam1(Handle h) { unsigned desc = ptr->p1InDesc; ref = (Ref)ptr->p1Title; - if (desc & 0x0200) check(rPString, ref); + if (ref && (desc & 0x0200)) check(rPString, ref); ref = (Ref)ptr->p1ColorTable; - if (desc & 0x0800) check(rWindColor, ref); + if (ref && (desc & 0x0800)) check(rWindColor, ref); ref = (Ref)ptr->p1ControlList; - switch(desc & 0xff) { - case singleResource: check(rControlTemplate, ref); break; - case resourceToResource: check(rControlList, ref); break; - default: break; /* warn about invalid value ? */ + if (ref) { + switch(desc & 0xff) { + case singleResource: check(rControlTemplate, ref); break; + case resourceToResource: check(rControlList, ref); break; + default: break; /* warn about invalid value ? */ + } } }