Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 6244:f2d4da9ba0f0 jdk7u25-b05
Merge
| author | asaha |
|---|---|
| date | Tue, 09 Apr 2013 13:25:25 -0700 |
| parents | 5d4d557f374f (current diff) 9efb5fb77027 (diff) |
| children | 7f4156b0b8d7 80d5cd2519bf |
| files | |
| diffstat | 5 files changed, 260 insertions(+), 226 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/lang/invoke/MethodHandleNatives.java Tue Apr 09 12:40:19 2013 -0700 +++ b/src/share/classes/java/lang/invoke/MethodHandleNatives.java Tue Apr 09 13:25:25 2013 -0700 @@ -431,21 +431,6 @@ return defc == sun.misc.Unsafe.class; case "lookup": return defc == java.lang.invoke.MethodHandles.class; - case "findStatic": - case "findVirtual": - case "findConstructor": - case "findSpecial": - case "findGetter": - case "findSetter": - case "findStaticGetter": - case "findStaticSetter": - case "bind": - case "unreflect": - case "unreflectSpecial": - case "unreflectConstructor": - case "unreflectGetter": - case "unreflectSetter": - return defc == java.lang.invoke.MethodHandles.Lookup.class; case "invoke": return defc == java.lang.reflect.Method.class; case "get":
--- a/src/share/classes/java/lang/invoke/MethodHandles.java Tue Apr 09 12:40:19 2013 -0700 +++ b/src/share/classes/java/lang/invoke/MethodHandles.java Tue Apr 09 13:25:25 2013 -0700 @@ -26,7 +26,6 @@ package java.lang.invoke; import java.lang.reflect.*; -import sun.invoke.WrapperInstance; import sun.invoke.util.ValueConversions; import sun.invoke.util.VerifyAccess; import sun.invoke.util.Wrapper; @@ -35,9 +34,11 @@ import java.util.Arrays; import sun.reflect.CallerSensitive; import sun.reflect.Reflection; -import sun.security.util.SecurityConstants; +import sun.reflect.misc.ReflectUtil; + import static java.lang.invoke.MethodHandleStatics.*; import static java.lang.invoke.MethodHandleNatives.Constants.*; +import sun.security.util.SecurityConstants; /** * This class consists exclusively of static methods that operate on or return @@ -564,13 +565,11 @@ * <a href="MethodHandles.Lookup.html#secmgr">refuses access</a> * @throws NullPointerException if any argument is null */ - @CallerSensitive public MethodHandle findStatic(Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException { MemberName method = resolveOrFail(refc, name, type, true); - Class<?> callerClass = Reflection.getCallerClass(); - checkSecurityManager(refc, method, callerClass); - return accessStatic(refc, method, findBoundCallerClass(method, callerClass)); + checkSecurityManager(refc, method); + return accessStatic(refc, method, findBoundCallerClass(method)); } private MethodHandle accessStatic(Class<?> refc, MemberName method, Class<?> callerClass) throws IllegalAccessException { @@ -623,12 +622,10 @@ * <a href="MethodHandles.Lookup.html#secmgr">refuses access</a> * @throws NullPointerException if any argument is null */ - @CallerSensitive public MethodHandle findVirtual(Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException { MemberName method = resolveOrFail(refc, name, type, false); - Class<?> callerClass = Reflection.getCallerClass(); - checkSecurityManager(refc, method, callerClass); - return accessVirtual(refc, method, findBoundCallerClass(method, callerClass)); + checkSecurityManager(refc, method); + return accessVirtual(refc, method, findBoundCallerClass(method)); } private MethodHandle resolveVirtual(Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException { MemberName method = resolveOrFail(refc, name, type, false); @@ -667,11 +664,10 @@ * <a href="MethodHandles.Lookup.html#secmgr">refuses access</a> * @throws NullPointerException if any argument is null */ - @CallerSensitive public MethodHandle findConstructor(Class<?> refc, MethodType type) throws NoSuchMethodException, IllegalAccessException { String name = "<init>"; MemberName ctor = resolveOrFail(refc, name, type, false, false, lookupClassOrNull()); - checkSecurityManager(refc, ctor, Reflection.getCallerClass()); + checkSecurityManager(refc, ctor); return accessConstructor(refc, ctor); } private MethodHandle accessConstructor(Class<?> refc, MemberName ctor) throws IllegalAccessException { @@ -737,14 +733,12 @@ * <a href="MethodHandles.Lookup.html#secmgr">refuses access</a> * @throws NullPointerException if any argument is null */ - @CallerSensitive public MethodHandle findSpecial(Class<?> refc, String name, MethodType type, Class<?> specialCaller) throws NoSuchMethodException, IllegalAccessException { checkSpecialCaller(specialCaller); MemberName method = resolveOrFail(refc, name, type, false, false, specialCaller); - Class<?> callerClass = Reflection.getCallerClass(); - checkSecurityManager(refc, method, callerClass); - return accessSpecial(refc, method, findBoundCallerClass(method, callerClass), specialCaller); + checkSecurityManager(refc, method); + return accessSpecial(refc, method, findBoundCallerClass(method), specialCaller); } private MethodHandle accessSpecial(Class<?> refc, MemberName method, Class<?> callerClass, @@ -801,10 +795,9 @@ * <a href="MethodHandles.Lookup.html#secmgr">refuses access</a> * @throws NullPointerException if any argument is null */ - @CallerSensitive public MethodHandle findGetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException { MemberName field = resolveOrFail(refc, name, type, false); - checkSecurityManager(refc, field, Reflection.getCallerClass()); + checkSecurityManager(refc, field); return makeAccessor(refc, field, false, false, 0); } private MethodHandle resolveGetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException { @@ -829,10 +822,9 @@ * <a href="MethodHandles.Lookup.html#secmgr">refuses access</a> * @throws NullPointerException if any argument is null */ - @CallerSensitive public MethodHandle findSetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException { MemberName field = resolveOrFail(refc, name, type, false); - checkSecurityManager(refc, field, Reflection.getCallerClass()); + checkSecurityManager(refc, field); return makeAccessor(refc, field, false, true, 0); } private MethodHandle resolveSetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException { @@ -856,10 +848,9 @@ * <a href="MethodHandles.Lookup.html#secmgr">refuses access</a> * @throws NullPointerException if any argument is null */ - @CallerSensitive public MethodHandle findStaticGetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException { MemberName field = resolveOrFail(refc, name, type, true); - checkSecurityManager(refc, field, Reflection.getCallerClass()); + checkSecurityManager(refc, field); return makeAccessor(refc, field, false, false, 1); } private MethodHandle resolveStaticGetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException { @@ -883,10 +874,9 @@ * <a href="MethodHandles.Lookup.html#secmgr">refuses access</a> * @throws NullPointerException if any argument is null */ - @CallerSensitive public MethodHandle findStaticSetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException { MemberName field = resolveOrFail(refc, name, type, true); - checkSecurityManager(refc, field, Reflection.getCallerClass()); + checkSecurityManager(refc, field); return makeAccessor(refc, field, false, true, 1); } private MethodHandle resolveStaticSetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException { @@ -940,15 +930,13 @@ * <a href="MethodHandles.Lookup.html#secmgr">refuses access</a> * @throws NullPointerException if any argument is null */ - @CallerSensitive public MethodHandle bind(Object receiver, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException { Class<? extends Object> refc = receiver.getClass(); // may get NPE MemberName method = resolveOrFail(refc, name, type, false); - Class<?> callerClass = Reflection.getCallerClass(); - checkSecurityManager(refc, method, callerClass); + checkSecurityManager(refc, method); checkMethod(refc, method, false); MethodHandle dmh = MethodHandleImpl.findMethod(method, true, lookupClassOrNull()); - MethodHandle bcmh = maybeBindCaller(method, dmh, findBoundCallerClass(method, callerClass)); + MethodHandle bcmh = maybeBindCaller(method, dmh, findBoundCallerClass(method)); if (bcmh != dmh) return fixVarargs(bcmh.bindTo(receiver), dmh); MethodHandle bmh = MethodHandleImpl.bindReceiver(dmh, receiver); if (bmh == null) @@ -977,7 +965,6 @@ * is set and {@code asVarargsCollector} fails * @throws NullPointerException if the argument is null */ - @CallerSensitive public MethodHandle unreflect(Method m) throws IllegalAccessException { MemberName method = new MemberName(m); assert(method.isMethod()); @@ -985,8 +972,7 @@ return MethodHandleImpl.findMethod(method, true, /*no lookupClass*/ null); checkMethod(method.getDeclaringClass(), method, method.isStatic()); MethodHandle mh = MethodHandleImpl.findMethod(method, true, lookupClassOrNull()); - Class<?> callerClass = Reflection.getCallerClass(); - mh = maybeBindCaller(method, mh, findBoundCallerClass(method, callerClass)); + mh = maybeBindCaller(method, mh, findBoundCallerClass(method)); return restrictProtectedReceiver(method, mh); } @@ -1011,7 +997,6 @@ * is set and {@code asVarargsCollector} fails * @throws NullPointerException if any argument is null */ - @CallerSensitive public MethodHandle unreflectSpecial(Method m, Class<?> specialCaller) throws IllegalAccessException { checkSpecialCaller(specialCaller); MemberName method = new MemberName(m); @@ -1019,8 +1004,7 @@ // ignore m.isAccessible: this is a new kind of access checkMethod(m.getDeclaringClass(), method, false); MethodHandle mh = MethodHandleImpl.findMethod(method, false, lookupClassOrNull()); - Class<?> callerClass = Reflection.getCallerClass(); - mh = maybeBindCaller(method, mh, findBoundCallerClass(method, callerClass)); + mh = maybeBindCaller(method, mh, findBoundCallerClass(method)); return restrictReceiver(method, mh, specialCaller); } @@ -1132,21 +1116,25 @@ /** * Find my trustable caller class if m is a caller sensitive method. * If this lookup object has private access, then the caller class is the lookupClass. - * Otherwise, it is the caller of the currently executing public API method (e.g., findVirtual). + * Otherwise, if m is caller-sensitive, throw IllegalAccessException. */ - Class<?> findBoundCallerClass(MemberName m, Class<?> caller) { + Class<?> findBoundCallerClass(MemberName m) throws IllegalAccessException { Class<?> callerClass = null; if (MethodHandleNatives.isCallerSensitive(m)) { - // Do not refactor this to a more "logical" place, since it is stack walk magic. - // Note that this is the same expression as in Step 2 below in checkSecurityManager. - callerClass = ((allowedModes & PRIVATE) != 0 - ? lookupClass // for strong access modes, no extra check - // next line does stack walk magic; do not refactor: - : caller); + // Only full-power lookup is allowed to resolve caller-sensitive methods + if (isFullPowerLookup()) { + callerClass = lookupClass; + } else { + throw new IllegalAccessException("Attempt to lookup caller-sensitive method using restricted lookup object"); + } } return callerClass; } + private boolean isFullPowerLookup() { + return (allowedModes & PRIVATE) != 0; + } + /** * Determine whether a security manager has an overridden * SecurityManager.checkMemberAccess method. @@ -1167,7 +1155,7 @@ * Perform necessary <a href="MethodHandles.Lookup.html#secmgr">access checks</a>. * This function performs stack walk magic: do not refactor it. */ - void checkSecurityManager(Class<?> refc, MemberName m, Class<?> caller) { + void checkSecurityManager(Class<?> refc, MemberName m) { SecurityManager smgr = System.getSecurityManager(); if (smgr == null) return; if (allowedModes == TRUSTED) return; @@ -1187,13 +1175,10 @@ } // Step 2: - Class<?> callerClass = ((allowedModes & PRIVATE) != 0 - ? lookupClass // for strong access modes, no extra check - : caller); - if (!VerifyAccess.classLoaderIsAncestor(lookupClass, refc) || - (callerClass != lookupClass && - !VerifyAccess.classLoaderIsAncestor(callerClass, refc))) - smgr.checkPackageAccess(VerifyAccess.getPackageName(refc)); + if (!isFullPowerLookup() || + !VerifyAccess.classLoaderIsAncestor(lookupClass, refc)) { + ReflectUtil.checkPackageAccess(refc); + } // Step 3: if (m.isPublic()) return; @@ -1203,7 +1188,8 @@ final int which = Member.DECLARED; final Class<?> clazz = defc; if (!overridden) { - if (caller.getClassLoader() != defc.getClassLoader()) { + if (!isFullPowerLookup() || + (lookupClass.getClassLoader() != defc.getClassLoader())) { smgr.checkPermission(SecurityConstants.CHECK_MEMBER_ACCESS_PERMISSION); } } else { @@ -1214,8 +1200,9 @@ } // Step 4: - if (defc != refc) - smgr.checkPackageAccess(VerifyAccess.getPackageName(defc)); + if (defc != refc) { + ReflectUtil.checkPackageAccess(defc); + } } void checkMethod(Class<?> refc, MemberName m, boolean wantStatic) throws IllegalAccessException {
--- a/src/share/native/sun/awt/medialib/awt_ImagingLib.c Tue Apr 09 12:40:19 2013 -0700 +++ b/src/share/native/sun/awt/medialib/awt_ImagingLib.c Tue Apr 09 13:25:25 2013 -0700 @@ -1152,22 +1152,127 @@ return retStatus; } +typedef struct { + jobject jArray; + jsize length; + unsigned char *table; +} LookupArrayInfo; + +#define NLUT 8 + +#ifdef _LITTLE_ENDIAN +#define INDEXES { 3, 2, 1, 0, 7, 6, 5, 4 } +#else +#define INDEXES { 0, 1, 2, 3, 4, 5, 6, 7 } +#endif + +static int lookupShortData(mlib_image* src, mlib_image* dst, + LookupArrayInfo* lookup) +{ + int x, y; + unsigned int mask = NLUT-1; + + unsigned short* srcLine = (unsigned short*)src->data; + unsigned char* dstLine = (unsigned char*)dst->data; + + static int indexes[NLUT] = INDEXES; + + for (y=0; y < src->height; y++) { + int nloop, nx; + int npix = src->width; + + unsigned short* srcPixel = srcLine; + unsigned char* dstPixel = dstLine; + +#ifdef SIMPLE_LOOKUP_LOOP + for (x=0; status && x < width; x++) { + unsigned short s = *srcPixel++; + if (s >= lookup->length) { + /* we can not handle source image using + * byte lookup table. Fall back to processing + * images in java + */ + return 0; + } + *dstPixel++ = lookup->table[s]; + } +#else + /* Get to 32 bit-aligned point */ + while(((uintptr_t)dstPixel & 0x3) != 0 && npix>0) { + unsigned short s = *srcPixel++; + if (s >= lookup->length) { + return 0; + } + *dstPixel++ = lookup->table[s]; + npix--; + } + + /* + * Do NLUT pixels per loop iteration. + * Pack into ints and write out 2 at a time. + */ + nloop = npix/NLUT; + nx = npix%NLUT; + + for(x=nloop; x!=0; x--) { + int i = 0; + int* dstP = (int*)dstPixel; + + for (i = 0; i < NLUT; i++) { + if (srcPixel[i] >= lookup->length) { + return 0; + } + } + + dstP[0] = (int) + ((lookup->table[srcPixel[indexes[0]]] << 24) | + (lookup->table[srcPixel[indexes[1]]] << 16) | + (lookup->table[srcPixel[indexes[2]]] << 8) | + lookup->table[srcPixel[indexes[3]]]); + dstP[1] = (int) + ((lookup->table[srcPixel[indexes[4]]] << 24) | + (lookup->table[srcPixel[indexes[5]]] << 16) | + (lookup->table[srcPixel[indexes[6]]] << 8) | + lookup->table[srcPixel[indexes[7]]]); + + + dstPixel += NLUT; + srcPixel += NLUT; + } + + /* + * Complete any remaining pixels + */ + for(x=nx; x!=0; x--) { + unsigned short s = *srcPixel++; + if (s >= lookup->length) { + return 0; + } + *dstPixel++ = lookup->table[s]; + } +#endif + + dstLine += dst->stride; // array of bytes, scan stride in bytes + srcLine += src->stride / 2; // array of shorts, scan stride in bytes + } + return 1; +} + JNIEXPORT jint JNICALL -Java_sun_awt_image_ImagingLib_lookupByteBI(JNIEnv *env, jobject this, +Java_sun_awt_image_ImagingLib_lookupByteBI(JNIEnv *env, jobject thisLib, jobject jsrc, jobject jdst, jobjectArray jtableArrays) { mlib_image *src; mlib_image *dst; void *sdata, *ddata; - unsigned char **table; unsigned char **tbl; unsigned char lut[256]; int retStatus = 1; int i; mlib_status status; - int jlen; - jobject *jtable; + int lut_nbands; + LookupArrayInfo *jtable; BufImageS_t *srcImageP, *dstImageP; int nbands; int ncomponents; @@ -1193,12 +1298,29 @@ return 0; } - jlen = (*env)->GetArrayLength(env, jtableArrays); + lut_nbands = (*env)->GetArrayLength(env, jtableArrays); ncomponents = srcImageP->cmodel.isDefaultCompatCM ? 4 : srcImageP->cmodel.numComponents; + if (lut_nbands > ncomponents) { + lut_nbands = ncomponents; + } + + /* Make sure that color order can be used for + * re-ordering of lookup arrays. + */ + for (i = 0; i < ncomponents; i++) { + int idx = srcImageP->hints.colorOrder[i]; + + if (idx < 0 || idx >= ncomponents) { + awt_freeParsedImage(srcImageP, TRUE); + awt_freeParsedImage(dstImageP, TRUE); + return 0; + } + } + tbl = NULL; if (SAFE_TO_ALLOC_2(ncomponents, sizeof(unsigned char *))) { tbl = (unsigned char **) @@ -1206,18 +1328,12 @@ } jtable = NULL; - if (SAFE_TO_ALLOC_2(jlen, sizeof(jobject *))) { - jtable = (jobject *)malloc(jlen * sizeof (jobject *)); + if (SAFE_TO_ALLOC_2(lut_nbands, sizeof(LookupArrayInfo))) { + jtable = (LookupArrayInfo *)malloc(lut_nbands * sizeof (LookupArrayInfo)); } - table = NULL; - if (SAFE_TO_ALLOC_2(jlen, sizeof(unsigned char *))) { - table = (unsigned char **)malloc(jlen * sizeof(unsigned char *)); - } - - if (tbl == NULL || table == NULL || jtable == NULL) { + if (tbl == NULL || jtable == NULL) { if (tbl != NULL) free(tbl); - if (table != NULL) free(table); if (jtable != NULL) free(jtable); awt_freeParsedImage(srcImageP, TRUE); awt_freeParsedImage(dstImageP, TRUE); @@ -1225,11 +1341,21 @@ return 0; } /* Need to grab these pointers before we lock down arrays */ - for (i=0; i < jlen; i++) { - jtable[i] = (*env)->GetObjectArrayElement(env, jtableArrays, i); - if (jtable[i] == NULL) { + for (i=0; i < lut_nbands; i++) { + jtable[i].jArray = (*env)->GetObjectArrayElement(env, jtableArrays, i); + + if (jtable[i].jArray != NULL) { + jtable[i].length = (*env)->GetArrayLength(env, jtable[i].jArray); + jtable[i].table = NULL; + + if (jtable[i].length < 256) { + /* we may read outside the table during lookup */ + jtable[i].jArray = NULL; + jtable[i].length = 0; + } + } + if (jtable[i].jArray == NULL) { free(tbl); - free(table); free(jtable); awt_freeParsedImage(srcImageP, TRUE); awt_freeParsedImage(dstImageP, TRUE); @@ -1242,7 +1368,6 @@ if (nbands < 1) { /* Can't handle any custom images */ free(tbl); - free(table); free(jtable); awt_freeParsedImage(srcImageP, TRUE); awt_freeParsedImage(dstImageP, TRUE); @@ -1253,7 +1378,6 @@ if (allocateArray(env, srcImageP, &src, &sdata, TRUE, FALSE, FALSE) < 0) { /* Must be some problem */ free(tbl); - free(table); free(jtable); awt_freeParsedImage(srcImageP, TRUE); awt_freeParsedImage(dstImageP, TRUE); @@ -1262,7 +1386,6 @@ if (allocateArray(env, dstImageP, &dst, &ddata, FALSE, FALSE, FALSE) < 0) { /* Must be some problem */ free(tbl); - free(table); free(jtable); freeArray(env, srcImageP, src, sdata, NULL, NULL, NULL); awt_freeParsedImage(srcImageP, TRUE); @@ -1278,7 +1401,7 @@ * sufficient number of lookup arrays we add references to identity * lookup array to make medialib happier. */ - if (jlen < ncomponents) { + if (lut_nbands < ncomponents) { int j; /* REMIND: This should be the size of the input lut!! */ for (j=0; j < 256; j++) { @@ -1287,65 +1410,45 @@ for (j=0; j < ncomponents; j++) { tbl[j] = lut; } - } - for (i=0; i < jlen; i++) { - table[i] = (unsigned char *) - (*env)->GetPrimitiveArrayCritical(env, jtable[i], NULL); - if (table[i] == NULL) { + for (i=0; i < lut_nbands; i++) { + jtable[i].table = (unsigned char *) + (*env)->GetPrimitiveArrayCritical(env, jtable[i].jArray, NULL); + if (jtable[i].table == NULL) { /* Free what we've got so far. */ int j; for (j = 0; j < i; j++) { (*env)->ReleasePrimitiveArrayCritical(env, - jtable[j], - (jbyte *) table[j], + jtable[j].jArray, + (jbyte *) jtable[j].table, JNI_ABORT); } free(tbl); - free(table); free(jtable); freeArray(env, srcImageP, src, sdata, NULL, NULL, NULL); awt_freeParsedImage(srcImageP, TRUE); awt_freeParsedImage(dstImageP, TRUE); return 0; } - tbl[srcImageP->hints.colorOrder[i]] = table[i]; + tbl[srcImageP->hints.colorOrder[i]] = jtable[i].table; } - if (jlen == 1) { + if (lut_nbands == 1) { for (i=1; i < nbands - srcImageP->cmodel.supportsAlpha; i++) { - tbl[srcImageP->hints.colorOrder[i]] = table[0]; + tbl[srcImageP->hints.colorOrder[i]] = jtable[0].table; } } /* Mlib needs 16bit lookuptable and must be signed! */ if (src->type == MLIB_SHORT) { - unsigned short *sdataP = (unsigned short *) src->data; - unsigned short *sP; if (dst->type == MLIB_BYTE) { - unsigned char *cdataP = (unsigned char *) dst->data; - unsigned char *cP; if (nbands > 1) { retStatus = 0; } else { - int x, y; - for (y=0; y < src->height; y++) { - cP = cdataP; - sP = sdataP; - for (x=0; x < src->width; x++) { - *cP++ = table[0][*sP++]; - } - - /* - * 4554571: increment pointers using the scanline stride - * in pixel units (not byte units) - */ - cdataP += dstImageP->raster.scanlineStride; - sdataP += srcImageP->raster.scanlineStride; - } + retStatus = lookupShortData(src, dst, &jtable[0]); } } /* How about ddata == null? */ @@ -1370,12 +1473,11 @@ } /* Release the LUT */ - for (i=0; i < jlen; i++) { - (*env)->ReleasePrimitiveArrayCritical(env, jtable[i], - (jbyte *) table[i], JNI_ABORT); + for (i=0; i < lut_nbands; i++) { + (*env)->ReleasePrimitiveArrayCritical(env, jtable[i].jArray, + (jbyte *) jtable[i].table, JNI_ABORT); } free ((void *) jtable); - free ((void *) table); free ((void *) tbl); /* Release the pinned memory */ @@ -1389,7 +1491,6 @@ return retStatus; } - JNIEXPORT jint JNICALL Java_sun_awt_image_ImagingLib_lookupByteRaster(JNIEnv *env, jobject this, @@ -1403,8 +1504,8 @@ mlib_image* dst; void* sdata; void* ddata; - jobject jtable[4]; - unsigned char* table[4]; + LookupArrayInfo jtable[4]; + unsigned char* mlib_lookupTable[4]; int i; int retStatus = 1; mlib_status status; @@ -1452,6 +1553,11 @@ src_nbands = srcRasterP->numBands; dst_nbands = dstRasterP->numBands; + /* adjust number of lookup bands */ + if (lut_nbands > src_nbands) { + lut_nbands = src_nbands; + } + /* MediaLib can't do more than 4 bands */ if (src_nbands <= 0 || src_nbands > 4 || dst_nbands <= 0 || dst_nbands > 4 || @@ -1516,22 +1622,37 @@ /* Get references to the lookup table arrays */ /* Need to grab these pointers before we lock down arrays */ for (i=0; i < lut_nbands; i++) { - jtable[i] = (*env)->GetObjectArrayElement(env, jtableArrays, i); - if (jtable[i] == NULL) { + jtable[i].jArray = (*env)->GetObjectArrayElement(env, jtableArrays, i); + jtable[i].table = NULL; + if (jtable[i].jArray != NULL) { + jtable[i].length = (*env)->GetArrayLength(env, jtable[i].jArray); + if (jtable[i].length < 256) { + /* we may read outside the table during lookup */ + jtable[i].jArray = NULL; + } + } + + if (jtable[i].jArray == NULL) + { + freeDataArray(env, srcRasterP->jdata, src, sdata, + dstRasterP->jdata, dst, ddata); + + awt_freeParsedRaster(srcRasterP, TRUE); + awt_freeParsedRaster(dstRasterP, TRUE); return 0; } } for (i=0; i < lut_nbands; i++) { - table[i] = (unsigned char *) - (*env)->GetPrimitiveArrayCritical(env, jtable[i], NULL); - if (table[i] == NULL) { + jtable[i].table = (unsigned char *) + (*env)->GetPrimitiveArrayCritical(env, jtable[i].jArray, NULL); + if (jtable[i].table == NULL) { /* Free what we've got so far. */ int j; for (j = 0; j < i; j++) { (*env)->ReleasePrimitiveArrayCritical(env, - jtable[j], - (jbyte *) table[j], + jtable[j].jArray, + (jbyte *) jtable[j].table, JNI_ABORT); } freeDataArray(env, srcRasterP->jdata, src, sdata, @@ -1540,6 +1661,7 @@ awt_freeParsedRaster(dstRasterP, TRUE); return 0; } + mlib_lookupTable[i] = jtable[i].table; } /* @@ -1548,107 +1670,28 @@ * contains single lookup array. */ for (i = lut_nbands; i < src_nbands; i++) { - table[i] = table[0]; + mlib_lookupTable[i] = jtable[0].table; } /* * Setup lookup array for "extra" channels */ for ( ; i < src->channels; i++) { - table[i] = ilut; + mlib_lookupTable[i] = ilut; } -#define NLUT 8 /* Mlib needs 16bit lookuptable and must be signed! */ if (src->type == MLIB_SHORT) { - unsigned short *sdataP = (unsigned short *) src->data; - unsigned short *sP; if (dst->type == MLIB_BYTE) { - unsigned char *cdataP = (unsigned char *) dst->data; - unsigned char *cP; if (lut_nbands > 1) { retStatus = 0; } else { - int x, y; - unsigned int mask = NLUT-1; - unsigned char* pLut = table[0]; - unsigned int endianTest = 0xff000000; - for (y=0; y < src->height; y++) { - int nloop, nx; - unsigned short* srcP; - int* dstP; - int npix = src->width; - cP = cdataP; - sP = sdataP; - /* Get to 32 bit-aligned point */ - while(((uintptr_t)cP & 0x3) != 0 && npix>0) { - *cP++ = pLut[*sP++]; - npix--; - } - - /* - * Do NLUT pixels per loop iteration. - * Pack into ints and write out 2 at a time. - */ - nloop = npix/NLUT; - nx = npix%NLUT; - srcP = sP; - dstP = (int*)cP; - - if(((char*)(&endianTest))[0] != 0) { - /* Big endian loop */ - for(x=nloop; x!=0; x--) { - dstP[0] = (int) - ((pLut[srcP[0]] << 24) | - (pLut[srcP[1]] << 16) | - (pLut[srcP[2]] << 8) | - pLut[srcP[3]]); - dstP[1] = (int) - ((pLut[srcP[4]] << 24) | - (pLut[srcP[5]] << 16) | - (pLut[srcP[6]] << 8) | - pLut[srcP[7]]); - dstP += NLUT/4; - srcP += NLUT; - } - } else { - /* Little endian loop */ - for(x=nloop; x!=0; x--) { - dstP[0] = (int) - ((pLut[srcP[3]] << 24) | - (pLut[srcP[2]] << 16) | - (pLut[srcP[1]] << 8) | - pLut[srcP[0]]); - dstP[1] = (int) - ((pLut[srcP[7]] << 24) | - (pLut[srcP[6]] << 16) | - (pLut[srcP[5]] << 8) | - pLut[srcP[4]]); - dstP += NLUT/4; - srcP += NLUT; - } - } - /* - * Complete any remaining pixels - */ - cP = cP + NLUT * nloop; - sP = sP + NLUT * nloop; - for(x=nx; x!=0; x--) { - *cP++ = pLut[*sP++]; - } - - /* - * 4554571: increment pointers using the scanline stride - * in pixel units (not byte units) - */ - cdataP += dstRasterP->scanlineStride; - sdataP += srcRasterP->scanlineStride; - } + retStatus = lookupShortData(src, dst, &jtable[0]); } } /* How about ddata == null? */ } else if ((status = (*sMlibFns[MLIB_LOOKUP].fptr)(dst, src, - (void **)table) != MLIB_SUCCESS)) { + (void **)mlib_lookupTable) != MLIB_SUCCESS)) { printMedialibError(status); retStatus = 0; } @@ -1677,8 +1720,8 @@ /* Release the LUT */ for (i=0; i < lut_nbands; i++) { - (*env)->ReleasePrimitiveArrayCritical(env, jtable[i], - (jbyte *) table[i], JNI_ABORT); + (*env)->ReleasePrimitiveArrayCritical(env, jtable[i].jArray, + (jbyte *) jtable[i].table, JNI_ABORT); } /* Release the pinned memory */
--- a/src/share/native/sun/awt/medialib/mlib_ImageCreate.c Tue Apr 09 12:40:19 2013 -0700 +++ b/src/share/native/sun/awt/medialib/mlib_ImageCreate.c Tue Apr 09 13:25:25 2013 -0700 @@ -160,27 +160,46 @@ /* Check if stride == width * If it is then image can be treated as a 1-D vector */ + + if (!SAFE_TO_MULT(width, channels)) { + return NULL; + } + + wb = width * channels; + switch (type) { case MLIB_DOUBLE: - wb = width * channels * 8; + if (!SAFE_TO_MULT(wb, 8)) { + return NULL; + } + wb *= 8; mask = 7; break; case MLIB_FLOAT: case MLIB_INT: - wb = width * channels * 4; + if (!SAFE_TO_MULT(wb, 4)) { + return NULL; + } + wb *= 4; mask = 3; break; case MLIB_USHORT: case MLIB_SHORT: - wb = width * channels * 2; + if (!SAFE_TO_MULT(wb, 2)) { + return NULL; + } + wb *= 2; mask = 1; break; case MLIB_BYTE: - wb = width * channels; + // wb is ready mask = 0; break; case MLIB_BIT: - wb = (width * channels + 7) / 8; + if (!SAFE_TO_ADD(7, wb)) { + return NULL; + } + wb = (wb + 7) / 8; mask = 0; break; default: @@ -270,7 +289,7 @@ break; case MLIB_USHORT: case MLIB_SHORT: - if (!SAFE_TO_MULT(wb, 4)) { + if (!SAFE_TO_MULT(wb, 2)) { return NULL; } wb *= 2;
--- a/src/windows/native/sun/windows/awt_Component.cpp Tue Apr 09 12:40:19 2013 -0700 +++ b/src/windows/native/sun/windows/awt_Component.cpp Tue Apr 09 13:25:25 2013 -0700 @@ -6131,7 +6131,7 @@ RGNDATA *pRgnData = (RGNDATA *) SAFE_SIZE_STRUCT_ALLOC(safe_Malloc, sizeof(RGNDATAHEADER), sizeof(RECT_T), numrects); - memcpy(pRgnData + sizeof(RGNDATAHEADER), pRect, sizeof(RECT_T) * numrects); + memcpy((BYTE*)pRgnData + sizeof(RGNDATAHEADER), pRect, sizeof(RECT_T) * numrects); if (pRect != rects) { free(pRect); }