[cp-patches] FYI: Don't crash in GtkImage when out of memory

[Mark Wielaard]

Hi,

We would crash and burn in GtkImage when we would run out of memory.
This patch just returns from native code (throwing an
OutOfMemoryException) when we couldn't allocate the int array needed.

2006-06-14  Mark Wielaard  <[EMAIL PROTECTED]>

    * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
    (Java_gnu_java_awt_peer_gtk_GtkImage_getPixels): Return when array
    cannot be allocated.

Committed,

Mark

--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c        8 Jun
2006 11:09:04 -0000       1.24
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c        14 Jun
2006 12:59:17 -0000
@@ -166,6 +166,11 @@
   rowstride = gdk_pixbuf_get_rowstride (pixbuf);

   result_array = (*env)->NewIntArray (env, (width * height));
+  if (result_array == NULL)
+    {
+      gdk_threads_leave ();
+      return NULL;
+    }

   dst = result_array_iter =
     (*env)->GetIntArrayElements (env, result_array, NULL);

signature.asc
Description: This is a digitally signed message part