From 7cbb7051f42c0220b35ce1e834853dac8706a69a Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 12 Mar 2010 17:12:14 -0800
Subject: meta: Fix up restoration of state if _mesa_map_pbo_source() fails.

---
 src/mesa/drivers/common/meta.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index b29f58db729..84a2a5fcb3a 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -2067,8 +2067,10 @@ _mesa_meta_Bitmap(GLcontext *ctx,
    }
 
    bitmap1 = _mesa_map_pbo_source(ctx, &unpackSave, bitmap1);
-   if (!bitmap1)
+   if (!bitmap1) {
+      _mesa_meta_end(ctx);
       return;
+   }
 
    bitmap8 = (GLubyte *) calloc(1, width * height);
    if (bitmap8) {
-- 
cgit v1.2.3