diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 11:04:10 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 11:04:10 +0100 |
| commit | 20029dbc8f7d03211ceaf00001418fb75b9df644 (patch) | |
| tree | e8950e052bb5ee4328a052a9cf04efc847c47eff /nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | |
| parent | 9d41e84ea9baf215c6de11224dc2597cd37359dc (diff) | |
| parent | 3e315cd17a519dbcafff18d4294a6f7bb8070767 (diff) | |
| download | nx-libs-20029dbc8f7d03211ceaf00001418fb75b9df644.tar.gz nx-libs-20029dbc8f7d03211ceaf00001418fb75b9df644.tar.bz2 nx-libs-20029dbc8f7d03211ceaf00001418fb75b9df644.zip | |
Merge branch 'uli42-pr/happyvalgrind' into 3.6.x
Fixes ArcticaProject/nx-libs#325.
Fixes ArcticaProject/nx-libs#326.
Attribute GH PR #360: https://github.com/ArcticaProject/nx-libs/pull/360
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXproperty.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 28fdd19f5..ee77eb64e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -205,6 +205,8 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, void * data; int copySize; + memset(&event, 0, sizeof(xEvent)); + sizeInBytes = format>>3; totalSize = len * sizeInBytes; @@ -332,11 +334,6 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, int ProcGetProperty(ClientPtr client) { - #ifdef NXAGENT_SERVER - nxagentWMStateRec wmState; - nxagentWMStateRec *wmsP = &wmState; - #endif - PropertyPtr pProp, prevProp; unsigned long n, len, ind; WindowPtr pWin; @@ -395,6 +392,10 @@ ProcGetProperty(ClientPtr client) (!pProp) && strcmp(NameForAtom(stuff->property), "WM_STATE") == 0) { + nxagentWMStateRec wmState; + nxagentWMStateRec *wmsP = &wmState; + + memset(&wmState, 0, sizeof(nxagentWMStateRec)); wmState.state = 1; wmState.icon = None; @@ -498,6 +499,7 @@ ProcGetProperty(ClientPtr client) { /* send the event */ xEvent event; + memset(&event, 0, sizeof(xEvent)); event.u.u.type = PropertyNotify; event.u.property.window = pWin->drawable.id; event.u.property.state = PropertyDelete; @@ -620,6 +622,7 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete, { /* send the event */ xEvent event; + memset(&event, 0, sizeof(xEvent)); event.u.u.type = PropertyNotify; event.u.property.window = pWin->drawable.id; event.u.property.state = PropertyDelete; |