# HG changeset patch
# User bae
# Date 1353162084 -14400
# Node ID 6081ed9a6461360252572f79713b20c49caa59ad
# Parent  1e4909147511ffa8f2089c488df2435af4707283
8002325: Improve management of images
Reviewed-by: prr, ahgross

diff --git a/src/share/native/sun/awt/image/awt_parseImage.c b/src/share/native/sun/awt/image/awt_parseImage.c
--- jdk/src/share/native/sun/awt/image/awt_parseImage.c
+++ jdk/src/share/native/sun/awt/image/awt_parseImage.c
@@ -223,9 +223,14 @@ int awt_parseRaster(JNIEnv *env, jobject
         return 0;
     }
 
+    rasterP->sppsm.isUsed = 0;
+
     if ((*env)->IsInstanceOf(env, rasterP->jsampleModel,
        (*env)->FindClass(env,"java/awt/image/SinglePixelPackedSampleModel"))) {
         jobject jmask, joffs, jnbits;
+
+        rasterP->sppsm.isUsed = 1;
+
         rasterP->sppsm.maxBitSize = (*env)->GetIntField(env,
                                                         rasterP->jsampleModel,
                                                         g_SPPSMmaxBitID);
@@ -711,6 +716,21 @@ setHints(JNIEnv *env, BufImageS_t *image
     }
     else if (cmodelP->cmType == DIRECT_CM_TYPE || cmodelP->cmType == PACKED_CM_TYPE) {
         int i;
+
+        /* do some sanity check first: make sure that
+         * - sample model is SinglePixelPackedSampleModel
+         * - number of bands in the raster corresponds to the number
+         *   of color components in the color model
+         */
+        if (!rasterP->sppsm.isUsed ||
+            rasterP->numBands != cmodelP->numComponents)
+        {
+            /* given raster is not compatible with the color model,
+             * so the operation has to be aborted.
+             */
+            return -1;
+        }
+
         if (cmodelP->maxNbits > 8) {
             hintP->needToExpand = TRUE;
             hintP->expandToNbits = cmodelP->maxNbits;
diff --git a/src/share/native/sun/awt/image/awt_parseImage.h b/src/share/native/sun/awt/image/awt_parseImage.h
--- jdk/src/share/native/sun/awt/image/awt_parseImage.h
+++ jdk/src/share/native/sun/awt/image/awt_parseImage.h
@@ -95,6 +95,7 @@ typedef struct {
     jint offsets[MAX_NUMBANDS];
     jint nBits[MAX_NUMBANDS];
     jint  maxBitSize;
+    jint isUsed; // flag to indicate whether the raster sample model is SPPSM
 } SPPSampleModelS_t;
 
 /* Struct that holds information for the Raster object */