See RED-47209, fix crash when using WITHSORTKEYS without SORTBY (#1572)

RediSearch · Sep 22, 2020 · 11a6218 · 11a6218
1 parent afbc834
commit 11a6218
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/aggregate/aggregate_exec.c b/src/aggregate/aggregate_exec.c
@@ -14,7 +14,7 @@ static void runCursor(RedisModuleCtx *outputCtx, Cursor *cursor, size_t num);
  * RLookup registry. Returns NULL if there is no sorting key
  */
 static const RSValue *getSortKey(AREQ *req, const SearchResult *r, const PLN_ArrangeStep *astp) {
-  if (!astp) {
+  if (!astp || !(astp->sortkeysLK)) {
     return NULL;
   }
   const RLookupKey *kk = astp->sortkeysLK[0];

diff --git a/src/pytest/test.py b/src/pytest/test.py
@@ -3155,6 +3155,12 @@ def testEmptyDoc(env):
     conn.execute_command('DEL', 'doc3')
     env.expect('FT.SEARCH idx *').equal([2L, 'doc4', ['t', 'foo'], 'doc2', ['t', 'foo']])
 
+def testRED47209(env):
+    conn = getConnectionByEnv(env)
+    env.expect('FT.CREATE idx SCHEMA t TEXT').ok()
+    conn.execute_command('hset', 'doc1', 't', 'foo')
+    env.expect('FT.SEARCH idx foo WITHSORTKEYS LIMIT 0 1').equal([1L, 'doc1', None, ['t', 'foo']])
+
 def testInvertedIndexWasEntirelyDeletedDuringCursor():
     env = Env(moduleArgs='GC_POLICY FORK FORK_GC_CLEAN_THRESHOLD 1')
 

diff --git a/srcutil/code_style.py b/srcutil/code_style.py
@@ -106,7 +106,7 @@
     rv = po.wait()
     if rv != 0:
         print('Warning: Could not analyze {}'.format(f))
-    count = len([line for line in output.split('\n') if line])
+    count = len([line for line in output.decode("utf-8").split('\n') if line])
     has_changes = count > 3
     if options.dry_run:
         if has_changes: