commit 7d0e0e3cd314812bf7404409680373afa73f507f
author Pali Rohár <pali.rohar@gmail.com> Sun May 04 23:06:09 2025 +0200
committer Martin Storsjö <martin@martin.st> Tue May 06 20:21:55 2025 +0300
tree db415a8ae1ba39c18ccbc1884772006d42043a9a
parent b4020af78908890964db240e1e9b9bdb7b2c65c4

genidl: Check if the DataDirectory[2] is present

NumberOfRvaAndSizes contains number of entries in DataDirectory[] array.

Signed-off-by: Martin Storsjö <martin@martin.st>

mingw-w64-tools/genidl/src/genidl_readpe.c

diff --git a/mingw-w64-tools/genidl/src/genidl_readpe.c b/mingw-w64-tools/genidl/src/genidl_readpe.c
index 1bdf8ae..cb3ec74 100644
--- a/mingw-w64-tools/genidl/src/genidl_readpe.c
+++ b/mingw-w64-tools/genidl/src/genidl_readpe.c
@@ -183,13 +183,15 @@
   if (be64)
   {
     fread (&hdr.hdr64, 1, sizeof (sImgNtHeaders64), fp);
-    res_size = hdr.hdr64.OptionalHeader.DataDirectory[2].size;
+    if (hdr.hdr64.OptionalHeader.NumberOfRvaAndSizes > 2)
+      res_size = hdr.hdr64.OptionalHeader.DataDirectory[2].size;
     sect_count = hdr.hdr64.FileHeader.NumberOfSections;
   }
   else
   {
     fread (&hdr.hdr32, 1, sizeof (sImgNtHeaders32), fp);
-    res_size = hdr.hdr32.OptionalHeader.DataDirectory[2].size;
+    if (hdr.hdr32.OptionalHeader.NumberOfRvaAndSizes > 2)
+      res_size = hdr.hdr32.OptionalHeader.DataDirectory[2].size;
     sect_count = hdr.hdr32.FileHeader.NumberOfSections;
   }
   if (!res_size)