[xsrc/trunk]: xsrc/external/mit/libX11/dist/modules/im/ximcp From 93fce3f4e79...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/3ef2e10ffe63
branches:  trunk
changeset: 10533:3ef2e10ffe63
user:      maya <maya%NetBSD.org@localhost>
date:      Tue Aug 04 15:47:27 2020 +0000

description:
>From 93fce3f4e79cbc737d6468a4f68ba3de1b83953b Mon Sep 17 00:00:00 2001
From: Yichao Yu <yyc1992%gmail.com@localhost>
Date: Sun, 2 Aug 2020 13:43:58 -0400
Subject: [PATCH] Fix size calculation in `_XimAttributeToValue`.

The check here guards the read below.
For `XimType_XIMStyles`, these are `num` of `CARD32` and for `XimType_XIMHotKeyTriggers`
these are `num` of `XIMTRIGGERKEY` ref[1] which is defined as 3 x `CARD32`.
(There are data after the `XIMTRIGGERKEY` according to the spec but they are not read by this
function and doesn't need to be checked.)

The old code here used the native datatype size instead of the wire protocol size causing
the check to always fail.

Also fix the size calculation for the header (size). It is 2 x CARD16 for both types
despite the unused `CARD16` for `XimType_XIMStyles`.

[1] https://www.x.org/releases/X11R7.6/doc/libX11/specs/XIM/xim.html#Input_Method_Styles

This fixes a regression caused by 388b303c62aa35a245f1704211a023440ad2c488 in 1.6.10.

diffstat:

 external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 05f20ebdc376 -r 3ef2e10ffe63 external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c
--- a/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c      Tue Aug 04 14:34:35 2020 +0000
+++ b/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c      Tue Aug 04 15:47:27 2020 +0000
@@ -265,7 +265,7 @@
 
            if (num > (USHRT_MAX / sizeof(XIMStyle)))
                return False;
-           if ((sizeof(num) + (num * sizeof(XIMStyle))) > data_len)
+           if ((2 * sizeof(CARD16) + (num * sizeof(CARD32))) > data_len)
                return False;
            alloc_len = sizeof(XIMStyles) + sizeof(XIMStyle) * num;
            if (alloc_len < sizeof(XIMStyles))
@@ -379,7 +379,7 @@
 
            if (num > (UINT_MAX / sizeof(XIMHotKeyTrigger)))
                return False;
-           if ((sizeof(num) + (num * sizeof(XIMHotKeyTrigger))) > data_len)
+           if ((2 * sizeof(CARD16) + (num * 3 * sizeof(CARD32))) > data_len)
                return False;
            alloc_len = sizeof(XIMHotKeyTriggers)
                      + sizeof(XIMHotKeyTrigger) * num;