# HG changeset patch
# User lana
# Date 1293122850 28800
# Node ID 12466ded7d516721f03e28d1accad6fd00195a96
# Parent  a272b8427ee74dc236739eaf2062fd5440a1463e# Parent  bac6e958f08e9f0161a1289ac4248191adfe9440
Merge

diff -r a272b8427ee7 -r 12466ded7d51 jdk/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c
--- a/jdk/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c	Thu Dec 23 00:03:46 2010 -0800
+++ b/jdk/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c	Thu Dec 23 08:47:30 2010 -0800
@@ -119,7 +119,8 @@
                 PtrCoord(srcInfo.rasBase,
                          srcInfo.bounds.x1, srcInfo.pixelStride,
                          srcInfo.bounds.y1, srcInfo.scanStride);
-            unsigned char *pMask =
+            unsigned char *pMask, *pMaskAlloc;
+            pMask = pMaskAlloc =
                 (*env)->GetPrimitiveArrayCritical(env, maskArray, 0);
             if (pMask == NULL) {
                 J2dRlsTraceLn(J2D_TRACE_ERROR,
@@ -274,7 +275,7 @@
             bpos += width * height * sizeof(jint);
 
             (*env)->ReleasePrimitiveArrayCritical(env, maskArray,
-                                                  pMask, JNI_ABORT);
+                                                  pMaskAlloc, JNI_ABORT);
         }
         SurfaceData_InvokeRelease(env, srcOps, &srcInfo);
     }