stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8005129: [parfait] #1122 - #1130 native/sun/awt/medialib/mlib_Image*.c Memory leak of pointer 'k' allocated with mlib_malloc

Browse Source 
Reviewed-by: prr, vadim
This commit is contained in:
Jia-Hong Chen 2013-02-08 11:25:42 -08:00 committed by Jennifer Godinez
parent fb6927c36c
commit 410876d0ee
11 changed files with 102 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jdk/src/share/native/sun/awt/medialib/mlib_ImageConv.h
View File

@ -31,6 +31,16 @@
extern "C" {
#endif /* __cplusplus */
// Shared macro defined for cleanup of allocated memory.
#ifndef FREE_AND_RETURN_STATUS
#define FREE_AND_RETURN_STATUS \
{ \
if (pbuff != buff) mlib_free(pbuff); \
if (k != akernel) mlib_free(k); \
return status; \
}
#endif /* FREE_AND_RETURN_STATUS */
void mlib_ImageXor80_aa(mlib_u8 *dl,
mlib_s32 wid,
mlib_s32 hgt,

4
jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c
View File

@ -253,8 +253,10 @@ mlib_status mlib_convMxNext_s32(mlib_image *dst,
if (mn > 256) {
dkernel = mlib_malloc(mn * sizeof(mlib_d64));
if (dkernel == NULL)
if (dkernel == NULL) {
if (dsa != dspace) mlib_free(dsa);
return MLIB_FAILURE;
}
}
while (scale > 30) {

16
jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
View File

@ -1886,6 +1886,8 @@ mlib_status CONV_FUNC_MxN
d64_2x32 dd;
GET_SRC_DST_PARAMETERS(DTYPE);
mlib_status status = MLIB_SUCCESS;
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
@ -1905,7 +1907,10 @@ mlib_status CONV_FUNC_MxN
k[i] = kernel[i]*fscale;
}
if (m == 1) return mlib_ImageConv1xN_ext(dst, src, k, n, dy_t, dy_b, cmask);
if (m == 1) {
status = mlib_ImageConv1xN_ext(dst, src, k, n, dy_t, dy_b, cmask);
FREE_AND_RETURN_STATUS;
}
swid = wid + (m - 1);
@ -1914,7 +1919,10 @@ mlib_status CONV_FUNC_MxN
if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
pbuff = mlib_malloc(sizeof(FTYPE)*bsize + sizeof(FTYPE *)*2*(n + 1));
if (pbuff == NULL) return MLIB_FAILURE;
if (pbuff == NULL) {
status = MLIB_FAILURE;
FREE_AND_RETURN_STATUS;
}
buffs = (FTYPE **)(pbuff + bsize);
}
@ -2318,9 +2326,7 @@ mlib_status CONV_FUNC_MxN
}
}
if (pbuff != buff) mlib_free(pbuff);
return MLIB_SUCCESS;
FREE_AND_RETURN_STATUS;
}
/***************************************************************/

16
jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c
View File

@ -1653,6 +1653,8 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
mlib_s32 *buffo, *buffi;
GET_SRC_DST_PARAMETERS(DTYPE);
mlib_status status = MLIB_SUCCESS;
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
@ -1672,14 +1674,20 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
k[i] = kernel[i]*fscale;
}
if (m == 1) return mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
if (m == 1) {
status = mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
FREE_AND_RETURN_STATUS;
}
bsize = (n + 3)*wid;
if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
pbuff = mlib_malloc(sizeof(FTYPE)*bsize + sizeof(FTYPE *)*2*(n + 1));
if (pbuff == NULL) return MLIB_FAILURE;
if (pbuff == NULL) {
status = MLIB_FAILURE;
FREE_AND_RETURN_STATUS;
}
buffs = (FTYPE **)(pbuff + bsize);
}
@ -2033,9 +2041,7 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
}
}
if (pbuff != buff) mlib_free(pbuff);
return MLIB_SUCCESS;
FREE_AND_RETURN_STATUS;
}
/***************************************************************/

16
jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c
View File

@ -1160,6 +1160,8 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
DEF_VARS_MxN(mlib_s32);
mlib_s32 chan2 = chan1 + chan1;
mlib_status status = MLIB_SUCCESS;
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
@ -1179,14 +1181,20 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
k[i] = kernel[i]*fscale;
}
if (m == 1) return mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
if (m == 1) {
status = mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
FREE_AND_RETURN_STATUS;
}
bsize = (n + 2)*wid;
if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
pbuff = mlib_malloc(sizeof(mlib_d64)*bsize + sizeof(mlib_d64*)*2*(n + 1));
if (pbuff == NULL) return MLIB_FAILURE;
if (pbuff == NULL) {
status = MLIB_FAILURE;
FREE_AND_RETURN_STATUS;
}
buffs = (mlib_d64**)(pbuff + bsize);
}
@ -1531,9 +1539,7 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
}
}
if (pbuff != buff) mlib_free(pbuff);
return MLIB_SUCCESS;
FREE_AND_RETURN_STATUS;
}
/***************************************************************/

16
jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c
View File

@ -1886,6 +1886,8 @@ mlib_status CONV_FUNC_MxN
d64_2x32 dd;
GET_SRC_DST_PARAMETERS(DTYPE);
mlib_status status = MLIB_SUCCESS;
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
@ -1905,7 +1907,10 @@ mlib_status CONV_FUNC_MxN
k[i] = kernel[i]*fscale;
}
if (m == 1) return mlib_ImageConv1xN_ext(dst, src, k, n, dy_t, dy_b, cmask);
if (m == 1) {
status = mlib_ImageConv1xN_ext(dst, src, k, n, dy_t, dy_b, cmask);
FREE_AND_RETURN_STATUS;
}
swid = wid + (m - 1);
@ -1914,7 +1919,10 @@ mlib_status CONV_FUNC_MxN
if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
pbuff = mlib_malloc(sizeof(FTYPE)*bsize + sizeof(FTYPE *)*2*(n + 1));
if (pbuff == NULL) return MLIB_FAILURE;
if (pbuff == NULL) {
status = MLIB_FAILURE;
FREE_AND_RETURN_STATUS;
}
buffs = (FTYPE **)(pbuff + bsize);
}
@ -2318,9 +2326,7 @@ mlib_status CONV_FUNC_MxN
}
}
if (pbuff != buff) mlib_free(pbuff);
return MLIB_SUCCESS;
FREE_AND_RETURN_STATUS;
}
/***************************************************************/

16
jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c
View File

@ -1654,6 +1654,8 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
mlib_s32 *buffo, *buffi;
GET_SRC_DST_PARAMETERS(DTYPE);
mlib_status status = MLIB_SUCCESS;
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
@ -1673,14 +1675,20 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
k[i] = kernel[i]*fscale;
}
if (m == 1) return mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
if (m == 1) {
status = mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
FREE_AND_RETURN_STATUS;
}
bsize = (n + 3)*wid;
if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
pbuff = mlib_malloc(sizeof(FTYPE)*bsize + sizeof(FTYPE *)*2*(n + 1));
if (pbuff == NULL) return MLIB_FAILURE;
if (pbuff == NULL) {
status = MLIB_FAILURE;
FREE_AND_RETURN_STATUS;
}
buffs = (FTYPE **)(pbuff + bsize);
}
@ -2034,9 +2042,7 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
}
}
if (pbuff != buff) mlib_free(pbuff);
return MLIB_SUCCESS;
FREE_AND_RETURN_STATUS;
}
/***************************************************************/

16
jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
View File

@ -1886,6 +1886,8 @@ mlib_status CONV_FUNC_MxN
d64_2x32 dd;
GET_SRC_DST_PARAMETERS(DTYPE);
mlib_status status = MLIB_SUCCESS;
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
@ -1905,7 +1907,10 @@ mlib_status CONV_FUNC_MxN
k[i] = kernel[i]*fscale;
}
if (m == 1) return mlib_ImageConv1xN_ext(dst, src, k, n, dy_t, dy_b, cmask);
if (m == 1) {
status = mlib_ImageConv1xN_ext(dst, src, k, n, dy_t, dy_b, cmask);
FREE_AND_RETURN_STATUS;
}
swid = wid + (m - 1);
@ -1914,7 +1919,10 @@ mlib_status CONV_FUNC_MxN
if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
pbuff = mlib_malloc(sizeof(FTYPE)*bsize + sizeof(FTYPE *)*2*(n + 1));
if (pbuff == NULL) return MLIB_FAILURE;
if (pbuff == NULL) {
status = MLIB_FAILURE;
FREE_AND_RETURN_STATUS;
}
buffs = (FTYPE **)(pbuff + bsize);
}
@ -2318,9 +2326,7 @@ mlib_status CONV_FUNC_MxN
}
}
if (pbuff != buff) mlib_free(pbuff);
return MLIB_SUCCESS;
FREE_AND_RETURN_STATUS;
}
/***************************************************************/

16
jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
View File

@ -1653,6 +1653,8 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
mlib_s32 *buffo, *buffi;
GET_SRC_DST_PARAMETERS(DTYPE);
mlib_status status = MLIB_SUCCESS;
if (scale > 30) {
fscale *= 1.0/(1 << 30);
scale -= 30;
@ -1672,14 +1674,20 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
k[i] = kernel[i]*fscale;
}
if (m == 1) return mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
if (m == 1) {
status = mlib_ImageConv1xN(dst, src, k, n, dn, cmask);
FREE_AND_RETURN_STATUS;
}
bsize = (n + 3)*wid;
if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
pbuff = mlib_malloc(sizeof(FTYPE)*bsize + sizeof(FTYPE *)*2*(n + 1));
if (pbuff == NULL) return MLIB_FAILURE;
if (pbuff == NULL) {
status = MLIB_FAILURE;
FREE_AND_RETURN_STATUS;
}
buffs = (FTYPE **)(pbuff + bsize);
}
@ -2033,9 +2041,7 @@ mlib_status CONV_FUNC(MxN)(mlib_image *dst,
}
}
if (pbuff != buff) mlib_free(pbuff);
return MLIB_SUCCESS;
FREE_AND_RETURN_STATUS;
}
/***************************************************************/

4
jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c
View File

@ -477,9 +477,9 @@ void *mlib_ImageCreateRowTable(mlib_image *img)
im_height = mlib_ImageGetHeight(img);
im_stride = mlib_ImageGetStride(img);
tline = mlib_ImageGetData(img);
if (tline == NULL) return NULL;
rtable = mlib_malloc((3 + im_height)*sizeof(mlib_u8 *));
if (rtable == NULL || tline == NULL) return NULL;
if (rtable == NULL) return NULL;
rtable[0] = 0;
rtable[1] = (mlib_u8*)((void **)rtable + 1);

10
jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h
View File

@ -31,6 +31,16 @@
extern "C" {
#endif /* __cplusplus */
// Shared macro defined for cleanup of allocated memory.
#ifndef FREE_AND_RETURN_STATUS
#define FREE_AND_RETURN_STATUS \
{ \
if (pbuff != buff) mlib_free(pbuff); \
if (k != akernel) mlib_free(k); \
return status; \
}
#endif /* FREE_AND_RETURN_STATUS */
mlib_status mlib_c_conv2x2ext_s16(mlib_image *dst,
const mlib_image *src,
mlib_s32 dx_l,