From: Bimba Shrestha <bimbashrestha@fb.com>
Date: Fri, 31 Jan 2020 01:54:01 +0000 (-0800)
Subject: Adding assert and using ZSTD_STRATEGY_MAX as ZSTD_NB_STRATEGIES
X-Git-Tag: v1.4.5^2~103^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d9cfa9ef9d92374c6f0fb59c16c3634fa0511f5;p=thirdparty%2Fzstd.git

Adding assert and using ZSTD_STRATEGY_MAX as ZSTD_NB_STRATEGIES
---

diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index 40d1e621c..fed0a179f 100644
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -544,7 +544,7 @@ static int init_cLevel(void) {
     return ZSTDCLI_CLEVEL_DEFAULT;
 }
 
-#define ZSTD_NB_STRATEGIES 9
+#define ZSTD_NB_STRATEGIES ZSTD_STRATEGY_MAX
 static const char* ZSTD_strategyMap[ZSTD_NB_STRATEGIES + 1] = { "", "ZSTD_fast",
                 "ZSTD_dfast", "ZSTD_greedy", "ZSTD_lazy", "ZSTD_lazy2", "ZSTD_btlazy2",
                 "ZSTD_btopt", "ZSTD_btultra", "ZSTD_btultra2"};
@@ -1240,6 +1240,7 @@ int main(int const argCount, const char* argv[])
                 DISPLAY(" - searchLog    : %u\n", cParams.searchLog);
                 DISPLAY(" - minMatch     : %u\n", cParams.minMatch);
                 DISPLAY(" - targetLength : %u\n", cParams.targetLength);
+                assert(cParams.strategy < ZSTD_NB_STRATEGIES + 1);
                 DISPLAY(" - strategy     : %s\n", ZSTD_strategyMap[(int)cParams.strategy]);
             }
         }