From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Thu, 16 May 2013 14:18:24 +0000 (+0200)
Subject: [2936] Handle rare relocation
X-Git-Tag: bind10-1.2.0beta1-release~457^2~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8da51f50f03d1b84d9be0bb73d4091ddf32149fb;p=thirdparty%2Fkea.git

[2936] Handle rare relocation
---

diff --git a/src/lib/datasrc/memory/zone_data_updater.h b/src/lib/datasrc/memory/zone_data_updater.h
index d802234fa2..43da9f9897 100644
--- a/src/lib/datasrc/memory/zone_data_updater.h
+++ b/src/lib/datasrc/memory/zone_data_updater.h
@@ -80,7 +80,13 @@ public:
             isc_throw(isc::InvalidOperation, "A ZoneDataUpdater already exists"
                       " on this memory segment. Destroy it first.");
         }
-        mem_sgmt_.setNamedAddress("updater_zone_data", zone_data_);
+        if (mem_sgmt_.setNamedAddress("updater_zone_data", zone_data_)) {
+            // It might have relocated during the set
+            zone_data_ =
+                static_cast<ZoneData*>(mem_sgmt_.getNamedAddress("updater_zone_data").
+                                       second);
+        }
+        assert(zone_data_);
     }
 
     /// The destructor.