devPrivates fixes

Backported from X.Org: commit 0693083335185ce05ee64546151f3fc43ce98575 Author: Lars Knoll <lars@trolltech.com> Date: Mon Mar 6 21:00:09 2006 +0000 render/picture.c Correctly initialize devPrivates variable in source only pictures to 0 miext/cw/cw.h Don't try to access devPrivates of source only pictures Backported-from-NX-by: Ulrich Sibiller <uli42@gmx.de>

devPrivates fixes
e073093c · Lars Knoll · Mihai Moldovan · 0a010adf · e073093c · e073093c
Commit e073093c authored Dec 05, 2017 by Lars Knoll Committed by Mihai Moldovan Dec 07, 2017
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

cw.h nx-X11/programs/Xserver/miext/cw/cw.h +2 -1

picture.c nx-X11/programs/Xserver/render/picture.c +1 -0

No files found.
--- a/nx-X11/programs/Xserver/miext/cw/cw.h
+++ b/nx-X11/programs/Xserver/miext/cw/cw.h
@@ -60,7 +60,8 @@ typedef struct {
    unsigned long   stateChanges;
 } cwPictureRec, *cwPicturePtr;

-#define getCwPicture(pPicture)	((cwPicturePtr)(pPicture)->devPrivates[cwPictureIndex].ptr)
+#define getCwPicture(pPicture) \
+    (pPicture->pDrawable ? (cwPicturePtr)(pPicture)->devPrivates[cwPictureIndex].ptr : 0)
 #define setCwPicture(pPicture,p) ((pPicture)->devPrivates[cwPictureIndex].ptr = (void *) (p))

 extern int  cwPictureIndex;

--- a/nx-X11/programs/Xserver/render/picture.c
+++ b/nx-X11/programs/Xserver/render/picture.c
@@ -982,6 +982,7 @@ static PicturePtr createSourcePicture(void)
    pPicture->pDrawable = 0;
    pPicture->pFormat = 0;
    pPicture->pNext = 0;
+    pPicture->devPrivates = 0;

    SetPictureToDefaults(pPicture);
    return pPicture;