fixed #690 crash of daemon on match mode all and empty full text quer…

…y; added regression to gtest
manticoresoftware · Feb 26, 2019 · 84fe740 · 84fe740
1 parent daa88b5
commit 84fe740
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/gtests_searchd.cpp b/src/gtests_searchd.cpp
@@ -251,4 +251,13 @@ TEST ( searchd_stuff, iovec_behaviour )
 	ASSERT_EQ ( tIO.IOSize (), 1 );
 	tIO.StepForward (4);
 	ASSERT_EQ ( tIO.IOSize (), 0 );
+}
+
+TEST ( searchd_stuff, prepare_emulation )
+{
+	CSphQuery tQuery;
+	tQuery.m_eMode = SPH_MATCH_ALL;
+	PrepareQueryEmulation ( &tQuery );
+
+	ASSERT_EQ ( tQuery.m_eRanker, SPH_RANK_PROXIMITY );
 }
diff --git a/src/searchd.cpp b/src/searchd.cpp
@@ -3756,7 +3756,7 @@ void PrepareQueryEmulation ( CSphQuery * pQuery )
 		return;
 
 	const char * szQuery = pQuery->m_sRawQuery.cstr ();
-	int iQueryLen = strlen(szQuery);
+	int iQueryLen = ( szQuery ? strlen(szQuery) : 0 );
 
 	pQuery->m_sQuery.Reserve ( iQueryLen*2+8 );
 	char * szRes = (char*) pQuery->m_sQuery.cstr ();