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

Refactor nghttp2_hd_inflate_hd

This commit is contained in:
Tatsuhiro Tsujikawa 2013-08-28 21:33:57 +09:00
parent 400615ca35
commit f0ef6e980f
1 changed files with 63 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
lib/nghttp2_hd.c
View File

@ -900,104 +900,8 @@ ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_context *inflater,
goto fail; goto fail;
} }
} }
} else if(c == 0x60u || c == 0x40u) { } else if(c == 0x40u || c == 0x60u || c == 0) {
/* Literal Header without Indexing - new name or Literal Header /* Literal Header Repr - New Name */
with incremental indexing - new name */
nghttp2_nv nv;
ssize_t namelen, valuelen;
if(++in == last) {
rv = NGHTTP2_ERR_HEADER_COMP;
goto fail;
}
in = decode_length(&namelen, in, last, 8);
if(namelen < 0 || in + namelen > last) {
rv = NGHTTP2_ERR_HEADER_COMP;
goto fail;
}
if(!nghttp2_check_header_name(in, namelen)) {
rv = NGHTTP2_ERR_HEADER_COMP;
goto fail;
}
nv.name = in;
in += namelen;
in = decode_length(&valuelen, in, last, 8);
if(valuelen < 0 || in + valuelen > last) {
rv = NGHTTP2_ERR_HEADER_COMP;
goto fail;
}
nv.namelen = namelen;
nv.value = in;
nv.valuelen = valuelen;
in += valuelen;
nghttp2_downcase(nv.name, nv.namelen);
if(c == 0x60u) {
rv = emit_newname_header(inflater, &nva_out, &nv);
} else {
nghttp2_hd_entry *new_ent;
new_ent = add_hd_table_incremental(inflater, &nv);
if(new_ent) {
rv = emit_indexed_header(inflater, &nva_out, new_ent);
} else {
rv = NGHTTP2_ERR_HEADER_COMP;
goto fail;
}
}
if(rv < 0) {
goto fail;
}
} else if((c & 0x60u) == 0x60u || (c & 0x40) == 0x40u) {
/* Literal Header without Indexing - indexed name or Literal
Header with incremental indexing - indexed name */
nghttp2_hd_entry *ent;
uint8_t *value;
ssize_t valuelen;
ssize_t index;
in = decode_length(&index, in, last, 5);
if(index < 0) {
rv = NGHTTP2_ERR_HEADER_COMP;
goto fail;
}
--index;
if(inflater->hd_tablelen <= index) {
rv = NGHTTP2_ERR_HEADER_COMP;
goto fail;
}
ent = inflater->hd_table[index];
in = decode_length(&valuelen, in , last, 8);
if(valuelen < 0 || in + valuelen > last) {
rv = NGHTTP2_ERR_HEADER_COMP;
goto fail;
}
value = in;
in += valuelen;
if((c & 0x60u) == 0x60u) {
rv = emit_indname_header(inflater, &nva_out, ent, value, valuelen);
} else {
nghttp2_nv nv;
nghttp2_hd_entry *new_ent;
++ent->ref;
nv.name = ent->nv.name;
nv.namelen = ent->nv.namelen;
nv.value = value;
nv.valuelen = valuelen;
new_ent = add_hd_table_incremental(inflater, &nv);
if(--ent->ref == 0) {
nghttp2_hd_entry_free(ent);
free(ent);
}
if(new_ent) {
rv = emit_indexed_header(inflater, &nva_out, new_ent);
} else {
rv = NGHTTP2_ERR_HEADER_COMP;
goto fail;
}
}
if(rv < 0) {
goto fail;
}
} else if(c == 0) {
/* Literal Header with substitution indexing - new name */
nghttp2_hd_entry *new_ent;
nghttp2_nv nv; nghttp2_nv nv;
ssize_t namelen, valuelen, subindex; ssize_t namelen, valuelen, subindex;
if(++in == last) { if(++in == last) {
@ -1015,38 +919,47 @@ ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_context *inflater,
} }
nv.name = in; nv.name = in;
in += namelen; in += namelen;
in = decode_length(&subindex, in, last, 8); if(c == 0) {
if(subindex < 0) { in = decode_length(&subindex, in, last, 8);
rv = NGHTTP2_ERR_HEADER_COMP; if(subindex < 0) {
goto fail; rv = NGHTTP2_ERR_HEADER_COMP;
goto fail;
}
} }
in = decode_length(&valuelen, in, last, 8); in = decode_length(&valuelen, in, last, 8);
if(valuelen < 0 || in + valuelen > last) { if(valuelen < 0 || in + valuelen > last) {
rv = NGHTTP2_ERR_HEADER_COMP; rv = NGHTTP2_ERR_HEADER_COMP;
goto fail; goto fail;
} }
nv.value = in;
nv.namelen = namelen; nv.namelen = namelen;
nv.value = in;
nv.valuelen = valuelen; nv.valuelen = valuelen;
in += valuelen; in += valuelen;
nghttp2_downcase(nv.name, nv.namelen); nghttp2_downcase(nv.name, nv.namelen);
new_ent = add_hd_table_subst(inflater, &nv, subindex); if(c == 0x60u) {
if(new_ent) { rv = emit_newname_header(inflater, &nva_out, &nv);
rv = emit_indexed_header(inflater, &nva_out, new_ent);
if(rv < 0) {
goto fail;
}
} else { } else {
rv = NGHTTP2_ERR_HEADER_COMP; nghttp2_hd_entry *new_ent;
if(c == 0) {
new_ent = add_hd_table_subst(inflater, &nv, subindex);
} else {
new_ent = add_hd_table_incremental(inflater, &nv);
}
if(new_ent) {
rv = emit_indexed_header(inflater, &nva_out, new_ent);
} else {
rv = NGHTTP2_ERR_HEADER_COMP;
}
}
if(rv != 0) {
goto fail; goto fail;
} }
} else { } else {
/* Literal Header with substitution indexing - indexed name */ /* Literal Header Repr - Indexed Name */
nghttp2_hd_entry *ent, *new_ent; nghttp2_hd_entry *ent;
ssize_t valuelen; uint8_t *value;
ssize_t index, subindex; ssize_t valuelen, index, subindex;
nghttp2_nv nv; in = decode_length(&index, in, last, (c & 0x40u) ? 5 : 6);
in = decode_length(&index, in, last, 6);
if(index < 0) { if(index < 0) {
rv = NGHTTP2_ERR_HEADER_COMP; rv = NGHTTP2_ERR_HEADER_COMP;
goto fail; goto fail;
@ -1057,34 +970,46 @@ ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_context *inflater,
goto fail; goto fail;
} }
ent = inflater->hd_table[index]; ent = inflater->hd_table[index];
in = decode_length(&subindex, in, last, 8); if((c & 0x40u) == 0) {
if(subindex < 0) { in = decode_length(&subindex, in, last, 8);
rv = NGHTTP2_ERR_HEADER_COMP; if(subindex < 0) {
goto fail; rv = NGHTTP2_ERR_HEADER_COMP;
goto fail;
}
} }
in = decode_length(&valuelen, in, last, 8); in = decode_length(&valuelen, in , last, 8);
if(valuelen < 0 || in + valuelen > last) { if(valuelen < 0 || in + valuelen > last) {
rv = NGHTTP2_ERR_HEADER_COMP; rv = NGHTTP2_ERR_HEADER_COMP;
goto fail; goto fail;
} }
++ent->ref; value = in;
nv.name = ent->nv.name;
nv.namelen = ent->nv.namelen;
nv.value = in;
nv.valuelen = valuelen;
in += valuelen; in += valuelen;
new_ent = add_hd_table_subst(inflater, &nv, subindex); if((c & 0x60u) == 0x60u) {
if(--ent->ref == 0) { rv = emit_indname_header(inflater, &nva_out, ent, value, valuelen);
nghttp2_hd_entry_free(ent);
free(ent);
}
if(new_ent) {
rv = emit_indexed_header(inflater, &nva_out, new_ent);
if(rv < 0) {
goto fail;
}
} else { } else {
rv = NGHTTP2_ERR_HEADER_COMP; nghttp2_nv nv;
nghttp2_hd_entry *new_ent;
++ent->ref;
nv.name = ent->nv.name;
nv.namelen = ent->nv.namelen;
nv.value = value;
nv.valuelen = valuelen;
if((c & 0x40u) == 0) {
new_ent = add_hd_table_subst(inflater, &nv, subindex);
} else {
new_ent = add_hd_table_incremental(inflater, &nv);
}
if(--ent->ref == 0) {
nghttp2_hd_entry_free(ent);
free(ent);
}
if(new_ent) {
rv = emit_indexed_header(inflater, &nva_out, new_ent);
} else {
rv = NGHTTP2_ERR_HEADER_COMP;
}
}
if(rv != 0) {
goto fail; goto fail;
} }
} }