diff --git a/src/share/native/sun/awt/medialib/mlib_ImageConv.h b/src/share/native/sun/awt/medialib/mlib_ImageConv.h
index 82243b913587aa0fd364cf96dd0142efb8292ac6..24d99cef10326549801a72eee3f9124d2cbee834 100644
--- a/src/share/native/sun/awt/medialib/mlib_ImageConv.h
+++ b/src/share/native/sun/awt/medialib/mlib_ImageConv.h
@@ -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,
diff --git a/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c b/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c
index e489f57dafb752bb14065e469f266677f15a4bb9..88ade07e31c07fc837bddfb86221ca1a69f57928 100644
--- a/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c
+++ b/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c
@@ -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) {
diff --git a/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c b/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
index 5ddcbb3e9b4e6ed50136b9ae5a9a009bfd91703f..845f9a56a227895a6640d1e6510b44ac00390530 100644
--- a/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
+++ b/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
@@ -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;
 }
 
 /***************************************************************/
diff --git a/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c b/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c
index 8c5ada353bdf1898a41f772fc3fe11b0dc6b975a..57dbca4c848649abff4c7b38244aeae8eb9383ae 100644
--- a/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c
+++ b/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c
@@ -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;
 }
 
 /***************************************************************/
diff --git a/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c b/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c
index eb7037307ca551959c78d3bf45cf94d9e7328fc8..9d80dddaf1baa49d1de6c3d54ed65c42af8fc504 100644
--- a/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c
+++ b/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c
@@ -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;
 }
 
 /***************************************************************/
diff --git a/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c b/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c
index 3a006ed5f83b522688b34a3c29515cdcaed0a660..961ade907b01114a06ad0137b37b9c89395dbab0 100644
--- a/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c
+++ b/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c
@@ -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;
 }
 
 /***************************************************************/
diff --git a/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c b/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c
index ce337534c6f36c8f1c1602e4b9b92e9c9e9c35f2..1f94eabba6615189fb4561ef5a35e44f5476dbb1 100644
--- a/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c
+++ b/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c
@@ -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;
 }
 
 /***************************************************************/
diff --git a/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c b/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
index f412112b168e7952a5c69fe03edf45cf9fbab3f6..9fb835c83fed7800ef3ca5b33b033bc6f8a6d8f2 100644
--- a/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
+++ b/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
@@ -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;
 }
 
 /***************************************************************/
diff --git a/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c b/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
index eb68aeff7ddab22e5cea49cb216e83df2caeafab..68578a27af9700038f5bc7f527dfc242543490d5 100644
--- a/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
+++ b/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
@@ -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;
 }
 
 /***************************************************************/
diff --git a/src/share/native/sun/awt/medialib/mlib_ImageCreate.c b/src/share/native/sun/awt/medialib/mlib_ImageCreate.c
index fe065b35df3c829e0f11172290ea69f65d75a9d5..40662d6b8cce5e65055fa03d52094601299be705 100644
--- a/src/share/native/sun/awt/medialib/mlib_ImageCreate.c
+++ b/src/share/native/sun/awt/medialib/mlib_ImageCreate.c
@@ -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);
diff --git a/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h b/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h
index 8b94af09ac8e14fe50f9f068129a83db4e4b6855..ba1cfa303c268adb20571a818355dc7579a5d05a 100644
--- a/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h
+++ b/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h
@@ -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,