RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: hpack: must reject huffman literals padded with more than 7 bits 

h2spec reported that we didn't check that no more than 7 bits of padding
were left after decoding an huffman-encoded literal. This is harmless but
better fix it now.

To backport to 1.8.
This commit is contained in:
Willy Tarreau 2017-12-03 12:00:36 +01:00
parent 9e28f459b4
commit 4235d18214
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hpack-huff.c
View File

@ -1518,8 +1518,12 @@ int huff_dec(const uint8_t *huff, int hlen, char *out, int olen)
if (bleft > 0) {
/* some bits were not consumed after the last code, they must
* match EOS (ie: all ones).
* match EOS (ie: all ones) and there must be 7 bits or less.
* (7541#5.2).
*/
if (bleft > 7)
return -1;
if ((code & -(1 << (32 - bleft))) != (uint32_t)-(1 << (32 - bleft)))
return -1;
}