Backported CORE-6015: Segfault when using expression index with complex expression

AlexPeshkoff · AlexPeshkoff · commit 35282da5fa58 · 2019-03-01T13:00:24.000+03:00
diff --git a/src/common/classes/auto.h b/src/common/classes/auto.h
@@ -139,6 +139,39 @@ class AutoSetRestore
 	T oldValue;
 };
 
+
+template <typename T>
+class AutoSetRestoreFlag
+{
+public:
+	AutoSetRestoreFlag(T* aValue, T newBit, bool set)
+		: value(aValue),
+		  bit(newBit),
+		  oldValue((*value) & bit)
+	{
+		if (set)
+			*value |= bit;
+		else
+			*value &= ~bit;
+	}
+
+	~AutoSetRestoreFlag()
+	{
+		*value &= ~bit;
+		*value |= oldValue;
+	}
+
+private:
+	// copying is prohibited
+	AutoSetRestoreFlag(const AutoSetRestoreFlag&);
+	AutoSetRestoreFlag& operator =(const AutoSetRestoreFlag&);
+
+	T* value;
+	T bit;
+	T oldValue;
+};
+
+
 template <typename T, typename T2>
 class AutoSetRestore2
 {
diff --git a/src/jrd/idx.cpp b/src/jrd/idx.cpp
@@ -774,6 +774,9 @@ void IDX_garbage_collect(thread_db*			tdbb,
 	insertion.iib_relation = rpb->rpb_relation;
 	insertion.iib_key = &key1;
 
+	Attachment* att = tdbb->getAttachment();
+	AutoSetRestoreFlag<ULONG> gc(&att->att_flags, ATT_no_cleanup, true);
+
 	WIN window(get_root_page(tdbb, rpb->rpb_relation));
 
 	index_root_page* root = (index_root_page*) CCH_FETCH(tdbb, &window, LCK_read, pag_root);
