summaryrefslogtreecommitdiffstats
path: root/meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff')
-rw-r--r--meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff48
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff b/meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff
new file mode 100644
index 0000000000..1e34b3f2e7
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff
@@ -0,0 +1,48 @@
1--- gtk+-2.6.4/gtk/gtkrbtree.c 2004-10-28 18:00:04.000000000 +0300
2+++ gtk+-2.6.4/gtk/gtkrbtree.c 2005-04-06 16:19:37.812789944 +0300
3@@ -1378,18 +1378,18 @@
4 g_return_val_if_fail (node != NULL, NULL);
5
6 /* Case 1: the node's below us. */
7- if (node->right != tree->nil)
8+ if (node && node->right != tree->nil)
9 {
10 node = node->right;
11- while (node->left != tree->nil)
12+ while (node && node->left != tree->nil)
13 node = node->left;
14 return node;
15 }
16
17 /* Case 2: it's an ancestor */
18- while (node->parent != tree->nil)
19+ while (node && node->parent != tree->nil)
20 {
21- if (node->parent->right == node)
22+ if (node->parent && node->parent->right == node)
23 node = node->parent;
24 else
25 return (node->parent);
26@@ -1407,18 +1407,18 @@
27 g_return_val_if_fail (node != NULL, NULL);
28
29 /* Case 1: the node's below us. */
30- if (node->left != tree->nil)
31+ if (node != NULL && node->left != tree->nil)
32 {
33 node = node->left;
34- while (node->right != tree->nil)
35+ while (node != NULL && node->right != tree->nil)
36 node = node->right;
37 return node;
38 }
39
40 /* Case 2: it's an ancestor */
41- while (node->parent != tree->nil)
42+ while (node != NULL && node->parent != tree->nil)
43 {
44- if (node->parent->left == node)
45+ if (node->parent && node->parent->left == node)
46 node = node->parent;
47 else
48 return (node->parent);