diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2018-06-12 13:05:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 13:05:19 +0200 |
| commit | bcecbebb746ca077d7c23c1cd561da75c875c0b8 (patch) | |
| tree | 56360f63baec4a8396811bb5bd3ede5d869e830b /src | |
| parent | 82661ba329413e899695d2792732ca2f43a1fcc1 (diff) | |
| parent | 13957c9d072b86bf8a084380591fcdc219aae108 (diff) | |
| download | redis-bcecbebb746ca077d7c23c1cd561da75c875c0b8.tar.gz | |
Merge pull request #5012 from shenlongxing/fix-config
fix active-defrag-threshold value error
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/config.c b/src/config.c index 1b229c43e..a6e45e033 100644 --- a/src/config.c +++ b/src/config.c @@ -509,14 +509,16 @@ void loadServerConfigFromString(char *config) { server.rdb_filename = zstrdup(argv[1]); } else if (!strcasecmp(argv[0],"active-defrag-threshold-lower") && argc == 2) { server.active_defrag_threshold_lower = atoi(argv[1]); - if (server.active_defrag_threshold_lower < 0) { - err = "active-defrag-threshold-lower must be 0 or greater"; + if (server.active_defrag_threshold_lower < 0 || + server.active_defrag_threshold_lower > 1000) { + err = "active-defrag-threshold-lower must be between 0 and 1000"; goto loaderr; } } else if (!strcasecmp(argv[0],"active-defrag-threshold-upper") && argc == 2) { server.active_defrag_threshold_upper = atoi(argv[1]); - if (server.active_defrag_threshold_upper < 0) { - err = "active-defrag-threshold-upper must be 0 or greater"; + if (server.active_defrag_threshold_upper < 0 || + server.active_defrag_threshold_upper > 1000) { + err = "active-defrag-threshold-upper must be between 0 and 1000"; goto loaderr; } } else if (!strcasecmp(argv[0],"active-defrag-ignore-bytes") && argc == 2) { |