archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7004728: [parfait] potential memory leaks in XRender code

Browse source 
Reviewed-by: bae, ceisserer
This commit is contained in:
Phil Race 2011-02-28 10:25:17 -08:00
parent 2a5a9cc238
commit 3c489ff5e2
1 changed files with 68 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

93
jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c
View file

@ -304,23 +304,27 @@ Java_sun_java2d_xr_XRBackendNative_XRenderRectanglesNative
color.blue = blue; color.blue = blue;
if (rectCnt <= 256) { if (rectCnt <= 256) {
xRects = &sRects[0]; xRects = &sRects[0];
} else { } else {
xRects = (XRectangle *) malloc(sizeof(XRectangle) * rectCnt); xRects = (XRectangle *) malloc(sizeof(XRectangle) * rectCnt);
if (xRects == NULL) { if (xRects == NULL) {
return; return;
} }
} }
if ((rects = (jint *) (*env)->GetPrimitiveArrayCritical(env, rectArray, NULL)) == NULL) { if ((rects = (jint *)
return; (*env)->GetPrimitiveArrayCritical(env, rectArray, NULL)) == NULL) {
if (xRects != &sRects[0]) {
free(xRects);
}
return;
} }
for (i=0; i < rectCnt; i++) { for (i=0; i < rectCnt; i++) {
xRects[i].x = rects[i*4 + 0]; xRects[i].x = rects[i*4 + 0];
xRects[i].y = rects[i*4 + 1]; xRects[i].y = rects[i*4 + 1];
xRects[i].width = rects[i*4 + 2]; xRects[i].width = rects[i*4 + 2];
xRects[i].height = rects[i*4 + 3]; xRects[i].height = rects[i*4 + 3];
} }
XRenderFillRectangles(awt_display, op, XRenderFillRectangles(awt_display, op,
@ -328,7 +332,7 @@ Java_sun_java2d_xr_XRBackendNative_XRenderRectanglesNative
(*env)->ReleasePrimitiveArrayCritical(env, rectArray, rects, JNI_ABORT); (*env)->ReleasePrimitiveArrayCritical(env, rectArray, rects, JNI_ABORT);
if (xRects != &sRects[0]) { if (xRects != &sRects[0]) {
free(xRects); free(xRects);
} }
} }
@ -610,17 +614,30 @@ Java_sun_java2d_xr_XRBackendNative_XRAddGlyphsNative
Glyph *gid = (Glyph *) malloc(sizeof(Glyph) * glyphCnt); Glyph *gid = (Glyph *) malloc(sizeof(Glyph) * glyphCnt);
if (xginfo == NULL || gid == NULL) { if (xginfo == NULL || gid == NULL) {
return; if (xginfo != NULL) {
free(xginfo);
}
if (gid != NULL) {
free(gid);
}
return;
} }
if ((glyphInfoPtrs = (jlong *) (*env)->GetPrimitiveArrayCritical(env, glyphInfoPtrsArray, NULL)) == NULL) { if ((glyphInfoPtrs = (jlong *)(*env)->
GetPrimitiveArrayCritical(env, glyphInfoPtrsArray, NULL)) == NULL)
{
free(xginfo);
free(gid);
return; return;
} }
if ((pixelData = (unsigned char *) if ((pixelData = (unsigned char *)
(*env)->GetPrimitiveArrayCritical(env, pixelDataArray, NULL)) == NULL) { (*env)->GetPrimitiveArrayCritical(env, pixelDataArray, NULL)) == NULL)
{
(*env)->ReleasePrimitiveArrayCritical(env, (*env)->ReleasePrimitiveArrayCritical(env,
glyphInfoPtrsArray, glyphInfoPtrs, JNI_ABORT); glyphInfoPtrsArray, glyphInfoPtrs, JNI_ABORT);
free(xginfo);
free(gid);
return; return;
} }
@ -637,7 +654,7 @@ Java_sun_java2d_xr_XRBackendNative_XRAddGlyphsNative
} }
XRenderAddGlyphs(awt_display, glyphSet, &gid[0], &xginfo[0], glyphCnt, XRenderAddGlyphs(awt_display, glyphSet, &gid[0], &xginfo[0], glyphCnt,
pixelData, pixelDataLength); (const char*)pixelData, pixelDataLength);
(*env)->ReleasePrimitiveArrayCritical(env, glyphInfoPtrsArray, glyphInfoPtrs, JNI_ABORT); (*env)->ReleasePrimitiveArrayCritical(env, glyphInfoPtrsArray, glyphInfoPtrs, JNI_ABORT);
(*env)->ReleasePrimitiveArrayCritical(env, pixelDataArray, pixelData, JNI_ABORT); (*env)->ReleasePrimitiveArrayCritical(env, pixelDataArray, pixelData, JNI_ABORT);
@ -684,22 +701,44 @@ Java_sun_java2d_xr_XRBackendNative_XRenderCompositeTextNative
xelts = &selts[0]; xelts = &selts[0];
}else { }else {
xelts = (XGlyphElt32 *) malloc(sizeof(XGlyphElt32) * eltCnt); xelts = (XGlyphElt32 *) malloc(sizeof(XGlyphElt32) * eltCnt);
if (xelts == NULL) {
return;
}
} }
if (glyphCnt <= 256) { if (glyphCnt <= 256) {
xids = &sids[0]; xids = &sids[0];
}else { } else {
xids = (Glyph *) malloc(sizeof(Glyph) * glyphCnt); xids = (Glyph *) malloc(sizeof(Glyph) * glyphCnt);
if (xids == NULL) {
if (xelts != &selts[0]) {
free(xelts);
}
return;
}
} }
if ((ids = (jint *) (*env)->GetPrimitiveArrayCritical(env, glyphIDArray, NULL)) == NULL) { if ((ids = (jint *)
return; (*env)->GetPrimitiveArrayCritical(env, glyphIDArray, NULL)) == NULL) {
if (xelts != &selts[0]) {
free(xelts);
}
if (xids != &sids[0]) {
free(xids);
}
return;
} }
if ((elts = (jint *) if ((elts = (jint *)
(*env)->GetPrimitiveArrayCritical(env, eltArray, NULL)) == NULL) { (*env)->GetPrimitiveArrayCritical(env, eltArray, NULL)) == NULL) {
(*env)->ReleasePrimitiveArrayCritical(env, (*env)->ReleasePrimitiveArrayCritical(env,
glyphIDArray, ids, JNI_ABORT); glyphIDArray, ids, JNI_ABORT);
return; if (xelts != &selts[0]) {
free(xelts);
}
if (xids != &sids[0]) {
free(xids);
}
return;
} }
for (i=0; i < glyphCnt; i++) { for (i=0; i < glyphCnt; i++) {
@ -724,11 +763,11 @@ Java_sun_java2d_xr_XRBackendNative_XRenderCompositeTextNative
(*env)->ReleasePrimitiveArrayCritical(env, eltArray, elts, JNI_ABORT); (*env)->ReleasePrimitiveArrayCritical(env, eltArray, elts, JNI_ABORT);
if (xelts != &selts[0]) { if (xelts != &selts[0]) {
free(xelts); free(xelts);
} }
if (xids != &sids[0]) { if (xids != &sids[0]) {
free(xids); free(xids);
} }
} }
@ -762,8 +801,12 @@ Java_sun_java2d_xr_XRBackendNative_GCRectanglesNative
} }
} }
if ((rects = (jint *) (*env)->GetPrimitiveArrayCritical(env, rectArray, NULL)) == NULL) { if ((rects = (jint*)
return; (*env)->GetPrimitiveArrayCritical(env, rectArray, NULL)) == NULL) {
if (xRects != &sRects[0]) {
free(xRects);
}
return;
} }
for (i=0; i < rectCnt; i++) { for (i=0; i < rectCnt; i++) {