From 3bd5ee6fc394bf7e27493f612a50cf632d44e20f Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 10 Feb 2021 10:28:27 -0500
Subject: [PATCH] TT#63000 fix SSCAN using empty key name

Change-Id: Ifd294f135e6f05ab0b356d4ca0de6adde54bf777
(cherry picked from commit c182f411d840dd4f4f9958a572addbcd5eb0ad75)
---
 debian/patches/series                                 |  1 +
 .../sipwise/db_redis_sscan_fix_empty_key.patch        | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 debian/patches/sipwise/db_redis_sscan_fix_empty_key.patch

diff --git a/debian/patches/series b/debian/patches/series
index 20f9b1bdd..3ec643b96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -84,6 +84,7 @@ sipwise/cfgt-skip-tm-vars-T_.patch
 sipwise/db_redis_skip_empty_keys.patch
 sipwise/db_redis_graceful_scan.patch
 sipwise/db_redis_sscan.patch
+sipwise/db_redis_sscan_fix_empty_key.patch
 ### active development
 sipwise/pua-fix-send_publish-behavior-on-PUA_DB_ONLY.patch
 sipwise/pua-update_version_puadb-use-pres_id-to-select-recor.patch
diff --git a/debian/patches/sipwise/db_redis_sscan_fix_empty_key.patch b/debian/patches/sipwise/db_redis_sscan_fix_empty_key.patch
new file mode 100644
index 000000000..507acbdad
--- /dev/null
+++ b/debian/patches/sipwise/db_redis_sscan_fix_empty_key.patch
@@ -0,0 +1,11 @@
+--- a/src/modules/db_redis/redis_dbase.c
++++ b/src/modules/db_redis/redis_dbase.c
+@@ -784,7 +784,7 @@
+     do {
+         snprintf(cursor_str, sizeof(cursor_str), "%lu", cursor);
+ 
+-        if (!index_key) {
++        if (!index_key || !index_key->len) {
+             if (db_redis_key_add_string(&query_v, "SCAN", 4) != 0) {
+                 LM_ERR("Failed to add scan command to scan query\n");
+                 goto err;