walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

deflatehd: Fix crash

This commit is contained in:
Tatsuhiro Tsujikawa 2014-12-19 23:23:42 +09:00
parent e8513b3241
commit 079682f313
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/deflatehd.cc
View File

@ -186,9 +186,11 @@ static int deflate_hd_json(json_t *obj, nghttp2_hd_deflater *deflater,
return 0; return 0;
} }
static void init_deflater(nghttp2_hd_deflater *deflater) { static nghttp2_hd_deflater *init_deflater() {
nghttp2_hd_deflater *deflater;
nghttp2_hd_deflate_new(&deflater, config.deflate_table_size); nghttp2_hd_deflate_new(&deflater, config.deflate_table_size);
nghttp2_hd_deflate_change_table_size(deflater, config.table_size); nghttp2_hd_deflate_change_table_size(deflater, config.table_size);
return deflater;
} }
static void deinit_deflater(nghttp2_hd_deflater *deflater) { static void deinit_deflater(nghttp2_hd_deflater *deflater) {
@ -197,7 +199,6 @@ static void deinit_deflater(nghttp2_hd_deflater *deflater) {
static int perform(void) { static int perform(void) {
json_error_t error; json_error_t error;
nghttp2_hd_deflater *deflater = NULL;
auto json = json_loadf(stdin, 0, &error); auto json = json_loadf(stdin, 0, &error);
@ -218,7 +219,7 @@ static int perform(void) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
init_deflater(deflater); auto deflater = init_deflater();
output_json_header(); output_json_header();
auto len = json_array_size(cases); auto len = json_array_size(cases);
@ -244,8 +245,8 @@ static int perform(void) {
static int perform_from_http1text(void) { static int perform_from_http1text(void) {
char line[1 << 14]; char line[1 << 14];
int seq = 0; int seq = 0;
nghttp2_hd_deflater *deflater = NULL;
init_deflater(deflater); auto deflater = init_deflater();
output_json_header(); output_json_header();
for (;;) { for (;;) {
std::vector<nghttp2_nv> nva; std::vector<nghttp2_nv> nva;