diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:10:57 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:10:57 +0200 |
| commit | 91d9218c0cc659f40918af6ac6c035c6c48d2c6d (patch) | |
| tree | 79054df1730d4723658b02cec311bc8ba7655662 /nx-X11/lib/src/xlibi18n/ICWrap.c | |
| parent | a502149a844736dcc7f7dedd7c63229c74a448ee (diff) | |
| parent | 4875a15ca61358a1c95b156b2279fce092451278 (diff) | |
| download | nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.tar.gz nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.tar.bz2 nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.zip | |
Merge branch 'uli42-pr/update_libX11_2022' into 3.6.x
Attributes GH PR #1037: https://github.com/ArcticaProject/nx-libs/pull/1037
Diffstat (limited to 'nx-X11/lib/src/xlibi18n/ICWrap.c')
| -rw-r--r-- | nx-X11/lib/src/xlibi18n/ICWrap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/lib/src/xlibi18n/ICWrap.c b/nx-X11/lib/src/xlibi18n/ICWrap.c index 69f080d87..f5caafb97 100644 --- a/nx-X11/lib/src/xlibi18n/ICWrap.c +++ b/nx-X11/lib/src/xlibi18n/ICWrap.c @@ -66,6 +66,7 @@ from The Open Group. #endif #include "Xlibint.h" #include "Xlcint.h" +#include "reallocarray.h" static int _XIMNestedListToNestedList( @@ -84,7 +85,7 @@ _XIMNestedListToNestedList( nlist++; } } - return ptr - list; + return (int) (ptr - list); } static void @@ -128,7 +129,7 @@ _XIMVaToNestedList(va_list var, int max_count, XIMArg **args_return) return; } - args = Xmalloc(((unsigned)max_count + 1) * sizeof(XIMArg)); + args = Xmallocarray((unsigned)max_count + 1, sizeof(XIMArg)); *args_return = args; if (!args) return; |