wres: fix for correctly read blank resource directory entry (issue #1338

)
open-watcom · Oct 10, 2024 · ac4dc15 · ac4dc15
1 parent 9149b77
commit ac4dc15
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/bld/wres/c/wrfirres.c b/bld/wres/c/wrfirres.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2024      The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -39,14 +40,20 @@ WResDirWindow WResFirstResource( WResDir currdir )
     WResDirWindow   wind;
 
     wind.CurrType = currdir->Head;
-    wind.CurrRes = wind.CurrType->Head;
-    wind.CurrLang = wind.CurrRes->Head;
+    if( wind.CurrType != NULL ) {
+        wind.CurrRes = wind.CurrType->Head;
+        wind.CurrLang = wind.CurrRes->Head;
+    } else {
+        wind.CurrRes = NULL;
+        wind.CurrLang = NULL;
+    }
 
     return( wind );
 }
 
-void WResSetEmptyWindow( WResDirWindow *wind ) {
-/***********************************************/
+void WResSetEmptyWindow( WResDirWindow *wind )
+/********************************************/
+{
     if( wind != NULL ) {
         wind->CurrType = NULL;
         wind->CurrRes = NULL;