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/Xext/shm.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/Xext/shm.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/shm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index e3fa3a24e..263adc3df 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -660,6 +660,7 @@ ProcPanoramiXShmGetImage(ClientPtr client) for(i = 1; i < PanoramiXNumScreens; i++) VERIFY_DRAWABLE(drawables[i], draw->info[i].id, client); + memset(&xgi, 0, sizeof(xShmGetImageReply)); xgi.visual = wVisual(((WindowPtr)pDraw)); xgi.type = X_Reply; xgi.length = 0; @@ -913,6 +914,7 @@ ProcShmPutImage(client) { xShmCompletionEvent ev; + memset(&ev, 0, sizeof(xShmCompletionEvent)); ev.type = ShmCompletionCode; ev.drawable = stuff->drawable; ev.minorEvent = X_ShmPutImage; @@ -947,6 +949,9 @@ ProcShmGetImage(client) } VERIFY_DRAWABLE(pDraw, stuff->drawable, client); VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client); + + memset(&xgi, 0, sizeof(xShmGetImageReply)); + if (pDraw->type == DRAWABLE_WINDOW) { if( /* check for being viewable */ |