fixed #513 crash or hung of daemon on empty SNIPPET expression; added…

… regressions to test 168
manticoresoftware · Sep 20, 2018 · ad3710d · ad3710d
1 parent b36d792
commit ad3710d
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 2 deletions.
diff --git a/src/searchd.cpp b/src/searchd.cpp
@@ -6287,7 +6287,7 @@ struct Expr_Snippet_c : public ISphStringExpr
 			int iResultLength = m_tHighlight.m_dRes.GetLength();
 			*ppStr = m_tHighlight.m_dRes.LeakData();
 			// skip trailing zero
-			return iResultLength-1;
+			return ( iResultLength ? iResultLength-1 : 0 );
 		} else
 			return PackSnippets ( m_tHighlight.m_dRes, m_tHighlight.m_dSeparators, m_tHighlight.m_sChunkSeparator.Length(), ppStr );
 	}