use data ptrs clone/free funcs only in schemas with data ptr atts

manticoresoftware · Apr 23, 2023 · 979fa27 · 979fa27
1 parent 754ba59
commit 979fa27
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/schema/helper.cpp b/src/schema/helper.cpp
@@ -100,11 +100,17 @@ void CSphSchemaHelper::ResetSchemaHelper()
 
 void CSphSchemaHelper::CloneMatch ( CSphMatch& tDst, const CSphMatch& rhs ) const
 {
-	CloneMatchSpecial ( tDst, rhs, m_dDataPtrAttrs );
+	if ( m_dDataPtrAttrs.GetLength() )
+		CloneMatchSpecial ( tDst, rhs, m_dDataPtrAttrs );
+	else
+		tDst.Combine ( rhs, GetDynamicSize() );
 }
 
 void CSphSchemaHelper::FreeDataPtrs ( CSphMatch& tMatch ) const
 {
+	if ( !m_dDataPtrAttrs.GetLength() )
+		return;
+
 	FreeDataSpecial ( tMatch, m_dDataPtrAttrs );
 }
 

diff --git a/src/sphinxsort.cpp b/src/sphinxsort.cpp
@@ -2285,8 +2285,11 @@ struct MatchCloner_t
 		// memorize old dynamic first
 		memcpy ( m_dRowBuf.Begin(), tDst.m_pDynamic, m_dRowBuf.GetLengthBytes() );
 
-		m_pSchema->FreeDataSpecial ( tDst, m_dOtherPtrRows );
-		m_pSchema->CloneMatchSpecial ( tDst, tSrc, m_dOtherPtrRows );
+		if ( m_dOtherPtrRows.GetLength() )
+		{
+			m_pSchema->FreeDataSpecial ( tDst, m_dOtherPtrRows );
+			m_pSchema->CloneMatchSpecial ( tDst, tSrc, m_dOtherPtrRows );
+		}
 
 		/*
 			FreeDataSpecial ( tDst, m_dOtherPtrRows );
@@ -2718,6 +2721,7 @@ class KBufferGroupSorter_T : public CSphMatchQueueTraits, protected BaseGroupSor
 	{
 		if_const ( NOTIFICATIONS && bNotify )
 			m_dJustPopped.Add ( RowTagged_t ( m_dData[iMatch] ) );
+
 		m_pSchema->FreeDataPtrs ( m_dData[iMatch] );
 
 		// on final pass we totally wipe match.