Changeset 383 for trunk/src/zAVLTree.c

Timestamp:

Dec 5, 2011, 10:30:33 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #281 (warnings from clang static analyzer).

File:

• trunk/src/zAVLTree.c (modified) (3 diffs)

trunk/src/zAVLTree.c

@@ -366 +366 @@
   depthdiff = R_DEPTH(avlnode) - L_DEPTH(avlnode);
 
-  if (depthdiff <= -2) {
+  if (depthdiff <= -2 && avlnode->left) {
     child = avlnode->left;
 
@@ -384 +384 @@
     else {
       gchild = child->right;
-      avlnode->left = gchild->right;
-      if (avlnode->left != NULL)
-        avlnode->left->parent = avlnode;
-      avlnode->depth = CALC_DEPTH(avlnode);
-      child->right = gchild->left;
-      if (child->right != NULL)
-        child->right->parent = child;
-      child->depth = CALC_DEPTH(child);
-      gchild->right = avlnode;
-      if (gchild->right != NULL)
-        gchild->right->parent = gchild;
-      gchild->left = child;
-      if (gchild->left != NULL)
-        gchild->left->parent = gchild;
-      gchild->depth = CALC_DEPTH(gchild);
-      *superparent = gchild;
-      gchild->parent = origparent;
-    }
-  }
-
-  else if (depthdiff >= 2) {
+      if (gchild)
+        {
+          avlnode->left = gchild->right;
+          if (avlnode->left != NULL)
+            avlnode->left->parent = avlnode;
+          avlnode->depth = CALC_DEPTH(avlnode);
+          child->right = gchild->left;
+          if (child->right != NULL)
+            child->right->parent = child;
+          child->depth = CALC_DEPTH(child);
+          gchild->right = avlnode;
+          if (gchild->right != NULL)
+            gchild->right->parent = gchild;
+          gchild->left = child;
+          if (gchild->left != NULL)
+            gchild->left->parent = gchild;
+          gchild->depth = CALC_DEPTH(gchild);
+          *superparent = gchild;
+          gchild->parent = origparent;
+        }
+    }
+  }
+
+  else if (depthdiff >= 2 && avlnode->right) {
     child = avlnode->right;
 
@@ -422 +425 @@
     else {
       gchild = child->left;
-      avlnode->right = gchild->left;
-      if (avlnode->right != NULL)
-        avlnode->right->parent = avlnode;
-      avlnode->depth = CALC_DEPTH(avlnode);
-      child->left = gchild->right;
-      if (child->left != NULL)
-        child->left->parent = child;
-      child->depth = CALC_DEPTH(child);
-      gchild->left = avlnode;
-      if (gchild->left != NULL)
-        gchild->left->parent = gchild;
-      gchild->right = child;
-      if (gchild->right != NULL)
-        gchild->right->parent = gchild;
-      gchild->depth = CALC_DEPTH(gchild);
-      *superparent = gchild;
-      gchild->parent = origparent;
+      if (gchild)
+        {
+          avlnode->right = gchild->left;
+          if (avlnode->right != NULL)
+            avlnode->right->parent = avlnode;
+          avlnode->depth = CALC_DEPTH(avlnode);
+          child->left = gchild->right;
+          if (child->left != NULL)
+            child->left->parent = child;
+          child->depth = CALC_DEPTH(child);
+          gchild->left = avlnode;
+          if (gchild->left != NULL)
+            gchild->left->parent = gchild;
+          gchild->right = child;
+          if (gchild->right != NULL)
+            gchild->right->parent = gchild;
+          gchild->depth = CALC_DEPTH(gchild);
+          *superparent = gchild;
+          gchild->parent = origparent;
+        }
     }
   }