Merge pull request #2350 from wiredtiger/WT-2251-ref-addr-leak

(cherry picked from commit e731ef8ab)

Conflicts:
	src/btree/bt_discard.c
	src/btree/bt_slvg.c
	src/btree/bt_split.c
	src/evict/evict_page.c
	src/reconcile/rec_write.c

2 files changed, 27 insertions, 0 deletions

diff --git a/src/btree/bt_split.c b/src/btree/bt_split.c
index 5fc2c4cd89f..c77dfdcf5e3 100644
--- a/src/btree/bt_split.c
+++ b/src/btree/bt_split.c
@@ -1239,6 +1239,12 @@ __split_insert(WT_SESSION_IMPL *session, WT_REF *ref)
 	child->addr = ref->addr;
 
 	/*
+	 * The address has moved to the replacement WT_REF.  Make sure it isn't
+	 * freed when the original ref is discarded.
+	 */
+	ref->addr = NULL;
+
+	/*
 	 * Copy the first key from the original page into first ref in the new
 	 * parent.  Pages created in memory always have a "smallest" insert
 	 * list, so look there first.  If we don't find one, get the first key
@@ -1438,6 +1444,11 @@ __split_insert(WT_SESSION_IMPL *session, WT_REF *ref)
 	return (0);
 
 err:	if (split_ref[0] != NULL) {
+		/*
+		 * The address was moved to the replacement WT_REF, restore it.
+		 */
+		ref->addr = split_ref[0]->addr;
+
 		__wt_free(session, split_ref[0]->key.ikey);
 		__wt_free(session, split_ref[0]);
 	}
diff --git a/src/include/btree.i b/src/include/btree.i
index 4029b29d207..271284f85a6 100644
--- a/src/include/btree.i
+++ b/src/include/btree.i
@@ -445,6 +445,22 @@ __wt_off_page(WT_PAGE *page, const void *p)
 }
 
 /*
+ * __wt_ref_free_addr --
+ *	Free the address in a reference, if necessary.
+ */
+static inline void
+__wt_ref_free_addr(WT_SESSION_IMPL *session, WT_REF *ref)
+{
+	if (ref->addr != NULL) {
+		if (ref->home == NULL || __wt_off_page(ref->home, ref->addr)) {
+			__wt_free(session, ((WT_ADDR *)ref->addr)->addr);
+			__wt_free(session, ref->addr);
+		} else
+			ref->addr = NULL;
+	}
+}
+
+/*
  * __wt_ref_key --
  *	Return a reference to a row-store internal page key as cheaply as
  * possible.