diff options
| author |  David G. Quintas <dgq@google.com> | 2017-04-02 20:00:50 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-04-02 20:00:50 -0700 |
| commit | c4f46018096a85f239ace283563ad5c192a6c433 (patch) | |
| tree | 9a500ac768ebf5c1e7f5fe838586ff4e5b078b02 /src/core/lib | |
| parent | f5ed5e1a57e9173ed61589638d582594c8ed6ff0 (diff) | |
| parent | 143cb774f2af77fbdb0e830d4a6364fb4984bad7 (diff) | |
Merge pull request #9838 from dgquintas/fuzzer_remove_asserts
Don't assert over invalid channel args
Diffstat (limited to 'src/core/lib')
| -rw-r--r-- | src/core/lib/surface/channel.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/core/lib/surface/channel.c b/src/core/lib/surface/channel.c index b4bfb92042..b3ba826bbc 100644 --- a/src/core/lib/surface/channel.c +++ b/src/core/lib/surface/channel.c @@ -150,17 +150,20 @@ grpc_channel *grpc_channel_create_with_builder( } else if (0 == strcmp(args->args[i].key, GRPC_COMPRESSION_CHANNEL_DEFAULT_LEVEL)) { channel->compression_options.default_level.is_set = true; - GPR_ASSERT(args->args[i].value.integer >= 0 && - args->args[i].value.integer < GRPC_COMPRESS_LEVEL_COUNT); channel->compression_options.default_level.level = - (grpc_compression_level)args->args[i].value.integer; + (grpc_compression_level)grpc_channel_arg_get_integer( + &args->args[i], + (grpc_integer_options){GRPC_COMPRESS_LEVEL_NONE, + GRPC_COMPRESS_LEVEL_NONE, + GRPC_COMPRESS_LEVEL_COUNT - 1}); } else if (0 == strcmp(args->args[i].key, GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM)) { channel->compression_options.default_algorithm.is_set = true; - GPR_ASSERT(args->args[i].value.integer >= 0 && - args->args[i].value.integer < GRPC_COMPRESS_ALGORITHMS_COUNT); channel->compression_options.default_algorithm.algorithm = - (grpc_compression_algorithm)args->args[i].value.integer; + (grpc_compression_algorithm)grpc_channel_arg_get_integer( + &args->args[i], + (grpc_integer_options){GRPC_COMPRESS_NONE, GRPC_COMPRESS_NONE, + GRPC_COMPRESS_ALGORITHMS_COUNT - 1}); } else if (0 == strcmp(args->args[i].key, GRPC_COMPRESSION_CHANNEL_ENABLED_ALGORITHMS_BITSET)) { |