frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip damage calls if DamageCreate fails in exa functions 

Fixes parfait errors such as:
   Null pointer dereference (CWE 476): Write to null pointer pDamage
        at line 1833 of miext/damage/damage.c in function 'DamageRegister'.
          Function DamageCreate may return constant 'NULL' at line 1775,
              called at line 232 of exa/exa_migration_mixed.c
              in function 'exaPrepareAccessReg_mixed'.
          Constant 'NULL' passed into function DamageRegister,
              argument pDamage, from call at line 237.
          Null pointer introduced at line 1775 of miext/damage/damage.c
              in function 'DamageCreate'.
   Null pointer dereference (CWE 476): Write to null pointer pDamage
        at line 1833 of miext/damage/damage.c in function 'DamageRegister'.
          Function DamageCreate may return constant 'NULL' at line 1775,
              called at line 104 of exa/exa_mixed.c
              in function 'exaCreatePixmap_mixed'.
          Constant 'NULL' passed into function DamageRegister,
              argument pDamage, from call at line 109.
          Null pointer introduced at line 1775 of miext/damage/damage.c
              in function 'DamageCreate'.

Checks are similar to handling results of other calls to DamageCreate.

[ This bug was found by the Parfait 1.3.0 bug checking tool.
  http://labs.oracle.com/pls/apex/f?p=labs:49:::::P49_PROJECT_ID:13 ]

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith 2013-08-18 18:02:49 -07:00
parent 7cf1b595c8
commit 6c06c268ad
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
exa/exa_migration_mixed.c
View File

@ -233,10 +233,13 @@ exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg)
pPixmap->drawable.pScreen, pPixmap->drawable.pScreen,
pPixmap); pPixmap);
DamageRegister(&pPixmap->drawable, pExaPixmap->pDamage); if (pExaPixmap->pDamage) {
/* This ensures that pending damage reflects the current operation. */ DamageRegister(&pPixmap->drawable, pExaPixmap->pDamage);
/* This is used by exa to optimize migration. */ /* This ensures that pending damage reflects the current
DamageSetReportAfterOp(pExaPixmap->pDamage, TRUE); * operation. This is used by exa to optimize migration.
*/
DamageSetReportAfterOp(pExaPixmap->pDamage, TRUE);
}
if (has_gpu_copy) { if (has_gpu_copy) {
exaPixmapDirty(pPixmap, 0, 0, pPixmap->drawable.width, exaPixmapDirty(pPixmap, 0, 0, pPixmap->drawable.width,

11
exa/exa_mixed.c
View File

@ -106,10 +106,13 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
pPixmap->drawable.pScreen, pPixmap->drawable.pScreen,
pPixmap); pPixmap);
DamageRegister(&pPixmap->drawable, pExaPixmap->pDamage); if (pExaPixmap->pDamage) {
/* This ensures that pending damage reflects the current operation. */ DamageRegister(&pPixmap->drawable, pExaPixmap->pDamage);
/* This is used by exa to optimize migration. */ /* This ensures that pending damage reflects the current
DamageSetReportAfterOp(pExaPixmap->pDamage, TRUE); * operation. This is used by exa to optimize migration.
*/
DamageSetReportAfterOp(pExaPixmap->pDamage, TRUE);
}
} }
} }