fix

Author: sanikolaev

src/sorterscroll.cpp

@@ -64,7 +64,7 @@ class ScrollSorter_T : public ISphMatchSorter
 	CSphVector<CSphRowitem>			m_dStatic;
 	CSphMatchComparatorState		m_tState;
 	ScrollSettings_t				m_tScroll;
-	CSphVector<const CSphColumnInfo*>	m_dAllocatedPtrAttrs; // Track which attributes we allocated pointers for
+	CSphVector<BYTE*>				m_dAllocatedPtrs; // Track allocated pointer values directly
 
 	FORCE_INLINE bool PushMatch ( const CSphMatch & tEntry );
 	void	SetupRefMatch();
@@ -161,9 +161,10 @@ void ScrollSorter_T<COMP>::SetupRefMatch()
 			// After remapping, pAttr should be SPH_ATTR_STRINGPTR, but check to be safe
 			if ( pAttr->m_eAttrType==SPH_ATTR_STRINGPTR )
 			{
-				sphSetRowAttr ( pRowData, pAttr->m_tLocator, (SphAttr_t)sphPackPtrAttr ( { (const BYTE*)i.m_sValue.cstr(), i.m_sValue.Length() } ) );
-				// Track that we allocated a pointer for this attribute
-				m_dAllocatedPtrAttrs.Add(pAttr);
+				BYTE * pPacked = sphPackPtrAttr ( { (const BYTE*)i.m_sValue.cstr(), i.m_sValue.Length() } );
+				sphSetRowAttr ( pRowData, pAttr->m_tLocator, (SphAttr_t)pPacked );
+				// Track the allocated pointer value directly
+				m_dAllocatedPtrs.Add(pPacked);
 			}
 			break;
 
@@ -181,26 +182,16 @@ void ScrollSorter_T<COMP>::SetupRefMatch()
 template <typename COMP>
 void ScrollSorter_T<COMP>::FreeDataPtrAttrs()
 {
-	if ( !m_tRefMatch.m_pDynamic && !m_tRefMatch.m_pStatic )
-		return;
-
-	// Only free pointers for attributes that we actually allocated
-	for ( auto pAttr : m_dAllocatedPtrAttrs )
+	// Free all pointers we allocated directly
+	// We store the pointer values themselves, not the attributes, so we don't need
+	// to access m_tRefMatch which might have been reset
+	for ( auto pPacked : m_dAllocatedPtrs )
 	{
-		if ( !pAttr )
-			continue;
-
-		if ( pAttr->m_tLocator.m_bDynamic && !m_tRefMatch.m_pDynamic )
-			continue;
-		if ( !pAttr->m_tLocator.m_bDynamic && !m_tRefMatch.m_pStatic )
-			continue;
-
-		auto pData = (BYTE *)m_tRefMatch.GetAttr ( pAttr->m_tLocator );
-		if ( pData )
-			sphDeallocatePacked(pData);
+		if ( pPacked )
+			sphDeallocatePacked(pPacked);
 	}
 
-	m_dAllocatedPtrAttrs.Resize(0);
+	m_dAllocatedPtrs.Resize(0);
 }
 
 /////////////////////////////////////////////////////////////////////