Merge branch 'busybox' into merge

1 files changed, 5 insertions, 2 deletions

diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c
index 856739c41..ede5a97e3 100644
--- a/libbb/compare_string_array.c
+++ b/libbb/compare_string_array.c
@@ -158,8 +158,11 @@ int FAST_FUNC index_in_substrings(const char *strings, const char *key)
 const char* FAST_FUNC nth_string(const char *strings, int n)
 {
         while (n) {
-                n--;
-                strings += strlen(strings) + 1;
+                if (*strings++ == '\0') {
+                        if (*strings == '\0') /* reached end of strings */
+                                break;
+                        n--;
+                }
         }
         return strings;
 }