debian/changelog | 7 +++++++ src/mesa/drivers/dri/nouveau/nouveau_driver.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-)
New commits: commit b79b607dbdc23ec0524ace3719f061f66a5ae305 Author: Sven Joachim <[email protected]> Date: Wed Mar 13 17:52:36 2013 +0100 Document the cherry-pick in debian/changelog diff --git a/debian/changelog b/debian/changelog index e5aba72..7ed256d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (8.0.5-4) UNRELEASED; urgency=low + + * Cherry-pick commit 17f1cb1d99 (dri/nouveau: fix crash in + nouveau_flush) from upstream master branch. + + -- Sven Joachim <[email protected]> Wed, 13 Mar 2013 17:52:18 +0100 + mesa (8.0.5-3) unstable; urgency=high * mesa: add bounds checking for uniform array access (CVE-2012-5129). commit 82b40f3729cbe4e100d10d2ef99db84ca919a9b9 Author: Jan de Groot <[email protected]> Date: Thu Mar 7 19:48:13 2013 +0100 dri/nouveau: fix crash in nouveau_flush https://bugs.freedesktop.org/show_bug.cgi?id=61947 Note: this is a candidate for the stable branches (cherry picked from commit 17f1cb1d99e66227d1e05925ef937643f5c1089a) diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c b/src/mesa/drivers/dri/nouveau/nouveau_driver.c index ba818f0..4f885bb 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c @@ -67,7 +67,8 @@ nouveau_flush(struct gl_context *ctx) __DRIdri2LoaderExtension *dri2 = screen->dri2.loader; __DRIdrawable *drawable = nctx->dri_context->driDrawablePriv; - dri2->flushFrontBuffer(drawable, drawable->loaderPrivate); + if (drawable && drawable->loaderPrivate) + dri2->flushFrontBuffer(drawable, drawable->loaderPrivate); } } -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
