diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-10-27 20:56:24 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-10-27 20:56:24 +0200 |
| commit | 2804320164cc0c0cc16741ca89eec8ba860723f3 (patch) | |
| tree | 20ef6b309e6ba307f1f4527a25111a0fb2df17e5 /nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | |
| parent | 2eb4a65ebd9aa04bd663fb9a7f0680fd2c56e990 (diff) | |
| parent | 60bce146ee344d477add3a559eb9f2de155e4c09 (diff) | |
| download | nx-libs-2804320164cc0c0cc16741ca89eec8ba860723f3.tar.gz nx-libs-2804320164cc0c0cc16741ca89eec8ba860723f3.tar.bz2 nx-libs-2804320164cc0c0cc16741ca89eec8ba860723f3.zip | |
Merge branch 'uli42-pr/clipboard_debug' into 3.6.x
Attributes GH PR #731: https://github.com/ArcticaProject/nx-libs/pull/731
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXproperty.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 6292b3508..9d8a46c4f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -88,6 +88,11 @@ typedef struct nxagentWMStateRec; #endif +#define PANIC +#define WARNING +#undef TEST +#undef DEBUG + int ProcChangeProperty(ClientPtr client) { @@ -563,15 +568,25 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete, unsigned long n, len, ind; if (!pWin) + { +#ifdef DEBUG + fprintf(stderr, "%s: invalid window\n", __func__); +#endif return BadWindow; - + } if (!ValidAtom(property)) { +#ifdef DEBUG + fprintf(stderr, "%s: invalid atom [%d]\n", __func__, property); +#endif return(BadAtom); } if ((type != AnyPropertyType) && !ValidAtom(type)) { +#ifdef DEBUG + fprintf(stderr, "%s: invalid type [%d]\n", __func__, type); +#endif return(BadAtom); } @@ -588,7 +603,12 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete, if (!pProp) + { +#ifdef DEBUG + fprintf(stderr, "%s: property not found [%d]\n", __func__, property); +#endif return (BadAtom); + } /* If the request type and actual type don't match. Return the property information, but not the data. */ @@ -615,6 +635,9 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete, if (n < ind) { +#ifdef DEBUG + fprintf(stderr, "%s: negative property len\n", __func__); +#endif return BadValue; } |