From 3315046b45b76ff58d60b268c56fb66bb054a946 Mon Sep 17 00:00:00 2001
From: Patrick Williams <iawillia@us.ibm.com>
Date: Wed, 9 May 2012 12:05:48 -0500
Subject: Segfault in map when removing root-node.

Change-Id: I0ed81f62d00c771ffb7d3fc98745ea47bd51f90f
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1043
Tested-by: Jenkins Server
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/lib/splaytree.C | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/lib')

diff --git a/src/lib/splaytree.C b/src/lib/splaytree.C
index 3ce271344..7505d4164 100644
--- a/src/lib/splaytree.C
+++ b/src/lib/splaytree.C
@@ -150,6 +150,11 @@ namespace Util
                 {
                     y->parent->child[direction(y->parent, n)] = y;
                 }
+                else
+                {
+                    // Removing root, so update header.
+                    header.parent = y;
+                }
 
                 y->child[LEFT] = n->child[LEFT];
                 if (y->child[LEFT])
-- 
cgit v1.2.1