Bug 381407 - reproducible crash in Debug's Variables view (PPC64)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
index 54c0ecd..3874088 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
@@ -527,10 +527,10 @@
for (int j=FOREGROUND_COLUMN; j<modelLength; j++) {
OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
- if (types [j] == OS.G_TYPE_STRING ()) {
- OS.g_free ((ptr [0]));
- } else if (ptr [0] != 0) {
- if (types [j] == OS.GDK_TYPE_COLOR()) {
+ if (ptr [0] != 0) {
+ if (types [j] == OS.G_TYPE_STRING ()) {
+ OS.g_free ((ptr [0]));
+ } else if (types [j] == OS.GDK_TYPE_COLOR()) {
OS.gdk_color_free (ptr [0]);
} else if (types [j] == OS.GDK_TYPE_PIXBUF()) {
OS.g_object_unref (ptr [0]);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
index 8416e69..e600455 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -572,10 +572,10 @@
for (int j = FOREGROUND_COLUMN; j < FIRST_COLUMN; j++) {
OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
OS.gtk_tree_store_set (newModel, newItem, j, ptr [0], -1);
- if (types [j] == OS.G_TYPE_STRING ()) {
- OS.g_free ((ptr [0]));
- } else if (ptr[0] != 0) {
- if (types[j] == OS.GDK_TYPE_COLOR()) {
+ if (ptr [0] != 0) {
+ if (types [j] == OS.G_TYPE_STRING ()) {
+ OS.g_free ((ptr [0]));
+ } else if (types[j] == OS.GDK_TYPE_COLOR()) {
OS.gdk_color_free(ptr[0]);
} else if (types[j] == OS.GDK_TYPE_PIXBUF()) {
OS.g_object_unref(ptr[0]);
@@ -585,16 +585,17 @@
}
}
for (int j= 0; j<modelLength - FIRST_COLUMN; j++) {
+ int newIndex = newStart + j;
OS.gtk_tree_model_get (oldModel, oldItem, oldStart + j, ptr, -1);
- OS.gtk_tree_store_set (newModel, newItem, newStart + j, ptr [0], -1);
- if (types [j] == OS.G_TYPE_STRING ()) {
- OS.g_free ((ptr [0]));
- } else if (ptr[0] != 0) {
- if (types[j] == OS.GDK_TYPE_COLOR()) {
+ OS.gtk_tree_store_set (newModel, newItem, newIndex, ptr [0], -1);
+ if (ptr[0] != 0) {
+ if (types [newIndex] == OS.G_TYPE_STRING ()) {
+ OS.g_free ((ptr [0]));
+ } else if (types[newIndex] == OS.GDK_TYPE_COLOR()) {
OS.gdk_color_free(ptr[0]);
- } else if (types[j] == OS.GDK_TYPE_PIXBUF()) {
+ } else if (types[newIndex] == OS.GDK_TYPE_PIXBUF()) {
OS.g_object_unref(ptr[0]);
- } else if (types[j] == OS.PANGO_TYPE_FONT_DESCRIPTION()) {
+ } else if (types[newIndex] == OS.PANGO_TYPE_FONT_DESCRIPTION()) {
OS.pango_font_description_free(ptr[0]);
}
}
