nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use a switch-statement when checking for compression method.

Browse Source 
This patch changes the way `tor_compress_new()`,
`tor_compress_process()`, and `tor_compress_free()` handles different
compression methods. This should give us compiler warnings in case an
additional compression method is added, but the developer forgets to add
handlers in the three aforementioned functions.

See https://bugs.torproject.org/21663
This commit is contained in:
Alexander Færøy 2017-04-18 03:39:43 +02:00 committed by Nick Mathewson
parent 300ac49685
commit c171af0487
1 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/common/compress.c
View File

@ -149,14 +149,22 @@ tor_compress_new(int compress, compress_method_t method,
state = tor_malloc_zero(sizeof(tor_compress_state_t)); state = tor_malloc_zero(sizeof(tor_compress_state_t));
state->method = method; state->method = method;
if (method == GZIP_METHOD || method == ZLIB_METHOD) { switch (method) {
tor_zlib_compress_state_t *zlib_state = case GZIP_METHOD:
tor_zlib_compress_new(compress, method, compression_level); case ZLIB_METHOD: {
tor_zlib_compress_state_t *zlib_state =
tor_zlib_compress_new(compress, method, compression_level);
if (zlib_state == NULL) if (zlib_state == NULL)
goto err;
state->u.zlib_state = zlib_state;
break;
}
case NO_METHOD:
case UNKNOWN_METHOD:
goto err; goto err;
state->u.zlib_state = zlib_state;
} }
return state; return state;
@ -185,11 +193,19 @@ tor_compress_process(tor_compress_state_t *state,
{ {
tor_assert(state != NULL); tor_assert(state != NULL);
if (state->method == GZIP_METHOD || state->method == ZLIB_METHOD) switch (state->method) {
return tor_zlib_compress_process(state->u.zlib_state, case GZIP_METHOD:
out, out_len, in, in_len, case ZLIB_METHOD:
finish); return tor_zlib_compress_process(state->u.zlib_state,
out, out_len, in, in_len,
finish);
case NO_METHOD:
case UNKNOWN_METHOD:
goto err;
}
err:
return TOR_COMPRESS_ERROR; return TOR_COMPRESS_ERROR;
} }
@ -200,8 +216,16 @@ tor_compress_free(tor_compress_state_t *state)
if (state == NULL) if (state == NULL)
return; return;
if (state->method == GZIP_METHOD || state->method == ZLIB_METHOD) switch (state->method) {
tor_zlib_compress_free(state->u.zlib_state); case GZIP_METHOD:
case ZLIB_METHOD:
tor_zlib_compress_free(state->u.zlib_state);
break;
case NO_METHOD:
case UNKNOWN_METHOD:
break;
}
tor_free(state); tor_free(state);
} }
@ -212,9 +236,17 @@ tor_compress_state_size(const tor_compress_state_t *state)
{ {
tor_assert(state != NULL); tor_assert(state != NULL);
if (state->method == GZIP_METHOD || state->method == ZLIB_METHOD) switch (state->method) {
return tor_zlib_compress_state_size(state->u.zlib_state); case GZIP_METHOD:
case ZLIB_METHOD:
return tor_zlib_compress_state_size(state->u.zlib_state);
case NO_METHOD:
case UNKNOWN_METHOD:
goto err;
}
err:
return 0; return 0;
} }