# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1594504897 -10800
# Node ID 78ece6187a7cdccbf3c3047d3c7ab8412b19f873
# Parent  f3be70c19ce91dc0112d378854c2ed3ff7670201
Make sure we won't access DMC64Image::extraData[] indices out of bounds when
dumping memory blocks.

diff -r f3be70c19ce9 -r 78ece6187a7c tools/gfxconv.c
--- a/tools/gfxconv.c	Sun Jul 12 01:00:59 2020 +0300
+++ b/tools/gfxconv.c	Sun Jul 12 01:01:37 2020 +0300
@@ -1765,8 +1765,10 @@
         res = dmDumpC64Block(fprefix, "bitmap", &img->bitmap[i], i);
         res = dmDumpC64Block(fprefix, "color", &img->color[i], i);
         res = dmDumpC64Block(fprefix, "screen", &img->screen[i], i);
-        res = dmDumpC64Block(fprefix, "extradata", &img->extraData[i], i);
         res = dmDumpC64Block(fprefix, "chardata", &img->charData[i], i);
+
+        if ((size_t) i < sizeof(img->extraData) / sizeof(img->extraData[0]))
+            res = dmDumpC64Block(fprefix, "extradata", &img->extraData[i], i);
     }
 
     return res;