Skip to content

TS-4097: Encode empty string properly with HPACK #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maskit wants to merge 2 commits into from
Closed

TS-4097: Encode empty string properly with HPACK #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceeaa8d
TS-4097: Encode empty string properly with HPACK
maskit Dec 22, 2015
2801729
TS-4097: Fix use of wrong variable in regression test
maskit Dec 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions proxy/http2/HPACK.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ encode_string(uint8_t *buf_start, const uint8_t *buf_end, const char *value, siz

// TODO Choose whether to use Huffman encoding wisely

if (use_huffman) {
if (use_huffman && value_len) {
data = static_cast<char *>(ats_malloc(value_len * 4));
if (data == NULL)
return -1;
Expand Down Expand Up @@ -369,8 +369,10 @@ encode_string(uint8_t *buf_start, const uint8_t *buf_end, const char *value, siz
}

// Value
memcpy(p, data, data_len);
p += data_len;
if (data_len) {
memcpy(p, data, data_len);
p += data_len;
}

if (use_huffman) {
ats_free(data);
Expand Down
12 changes: 9 additions & 3 deletions proxy/http2/RegressionHPACK.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,15 @@ const static struct {
uint32_t raw_string_len;
uint8_t *encoded_field;
int encoded_field_len;
} string_test_case[] = {{(char *)"custom-key", 10, (uint8_t *) "\xA"
} string_test_case[] = {{(char *)"", 0, (uint8_t *) "\x0"
"",
1},
{(char *)"custom-key", 10, (uint8_t *) "\xA"
"custom-key",
11},
{(char *)"", 0, (uint8_t *) "\x80"
"",
1},
{(char *)"custom-key", 10, (uint8_t *) "\x88"
"\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f",
9}};
Expand Down Expand Up @@ -232,13 +238,13 @@ REGRESSION_TEST(HPACK_EncodeString)(RegressionTest *t, int, int *pstatus)
int len;

// FIXME Current encoder support only huffman conding.
for (unsigned int i = 1; i < 2; i++) {
for (unsigned int i = 2; i < sizeof(string_test_case) / sizeof(string_test_case[0]); i++) {
memset(buf, 0, BUFSIZE_FOR_REGRESSION_TEST);

len = encode_string(buf, buf + BUFSIZE_FOR_REGRESSION_TEST, string_test_case[i].raw_string, string_test_case[i].raw_string_len);

box.check(len == string_test_case[i].encoded_field_len, "encoded length was %d, expecting %d", len,
integer_test_case[i].encoded_field_len);
string_test_case[i].encoded_field_len);
box.check(len > 0 && memcmp(buf, string_test_case[i].encoded_field, len) == 0, "encoded string was invalid");
}
}
Expand Down