diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2022-01-19 00:45:43 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:08:46 +0200 |
| commit | 4875a15ca61358a1c95b156b2279fce092451278 (patch) | |
| tree | 79054df1730d4723658b02cec311bc8ba7655662 /nx-X11/lib/src/StName.c | |
| parent | a502149a844736dcc7f7dedd7c63229c74a448ee (diff) | |
| download | nx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.gz nx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.bz2 nx-libs-4875a15ca61358a1c95b156b2279fce092451278.zip | |
Update libNX_X11 to upstream's libX11-1.7.3.1-10-gd60ede78
Diffstat (limited to 'nx-X11/lib/src/StName.c')
| -rw-r--r-- | nx-X11/lib/src/StName.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nx-X11/lib/src/StName.c b/nx-X11/lib/src/StName.c index a003a109e..817ce936d 100644 --- a/nx-X11/lib/src/StName.c +++ b/nx-X11/lib/src/StName.c @@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <limits.h> #include <nx-X11/Xlibint.h> #include <nx-X11/Xatom.h> @@ -36,9 +37,11 @@ XStoreName ( Window w, _Xconst char *name) { - return XChangeProperty(dpy, w, XA_WM_NAME, XA_STRING, + if (name != NULL && strlen(name) >= USHRT_MAX) + return 0; + return XChangeProperty(dpy, w, XA_WM_NAME, XA_STRING, /* */ 8, PropModeReplace, (_Xconst unsigned char *)name, - name ? strlen(name) : 0); + name ? (int) strlen(name) : 0); } int @@ -47,7 +50,9 @@ XSetIconName ( Window w, _Xconst char *icon_name) { + if (icon_name != NULL && strlen(icon_name) >= USHRT_MAX) + return 0; return XChangeProperty(dpy, w, XA_WM_ICON_NAME, XA_STRING, 8, PropModeReplace, (_Xconst unsigned char *)icon_name, - icon_name ? strlen(icon_name) : 0); + icon_name ? (int) strlen(icon_name) : 0); } |