diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2016-06-17 14:48:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-17 14:48:41 +0200 |
| commit | 0b4b7ebd957448cb59cf3e3c365772b29067ede7 (patch) | |
| tree | 703b19b52bfdf5fd000c3809c03ff52320112efb | |
| parent | f7351f4c07f5e0b1c9bdb6949f45f84576ffd75f (diff) | |
| parent | 5fa711fa3749eb2605ff02e1dd08d62e3fc56f0e (diff) | |
| download | redis-0b4b7ebd957448cb59cf3e3c365772b29067ede7.tar.gz | |
Merge pull request #3252 from oranagra/config_fix
fix: config set list-max-ziplist-size didn't support negative values
| -rw-r--r-- | src/config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/config.c b/src/config.c index e7ef4d0ec..77029b934 100644 --- a/src/config.c +++ b/src/config.c @@ -733,7 +733,7 @@ void loadServerConfig(char *filename, char *options) { #define config_set_numerical_field(_name,_var,min,max) \ } else if (!strcasecmp(c->argv[2]->ptr,_name)) { \ - if (getLongLongFromObject(o,&ll) == C_ERR || ll < 0) goto badfmt; \ + if (getLongLongFromObject(o,&ll) == C_ERR) goto badfmt; \ if (min != LLONG_MIN && ll < min) goto badfmt; \ if (max != LLONG_MAX && ll > max) goto badfmt; \ _var = ll; @@ -964,9 +964,9 @@ void configSetCommand(client *c) { } config_set_numerical_field( "hash-max-ziplist-value",server.hash_max_ziplist_value,0,LLONG_MAX) { } config_set_numerical_field( - "list-max-ziplist-size",server.list_max_ziplist_size,0,LLONG_MAX) { + "list-max-ziplist-size",server.list_max_ziplist_size,INT_MIN,INT_MAX) { } config_set_numerical_field( - "list-compress-depth",server.list_compress_depth,0,LLONG_MAX) { + "list-compress-depth",server.list_compress_depth,0,INT_MAX) { } config_set_numerical_field( "set-max-intset-entries",server.set_max_intset_entries,0,LLONG_MAX) { } config_set_numerical_field( |