Skip to content

fix(q): validate table wire markers #9

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

Merged
protocolstardust merged 1 commit into from
Sep 25, 2026
Merged

fix(q): validate table wire markers #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion q.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,8 @@ static ray_t *q_des_obj(uint8_t **buf, int64_t *len) {

case Q_XT: { /* table = attrs(0) + dict_marker(99) + keys + values */
Q_NEED(2);
if ((*buf)[0] != 0 || (*buf)[1] != Q_XD)
return ray_error("q: malformed table marker", NULL);
(*buf) += 2;
*len -= 2;
ray_t *keys = q_des_obj(buf, len);
Expand Down Expand Up @@ -1373,7 +1375,9 @@ ray_t *q_decode(uint8_t *resp, int64_t resp_len, int compressed, char *err,
free(decompressed);
if (result == NULL)
q_set_err(err, errlen, "q: deserialization returned null");
else if (remaining != 0) {
else if (RAY_IS_ERR(result)) {
return result;
} else if (remaining != 0) {
q_release_any(result);
q_set_err(err, errlen, "q: trailing bytes after object");
return NULL;
Expand Down
15 changes: 15 additions & 0 deletions test/driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,21 @@ static int run_codec_selftest(void) {
}
release_any(r);

err[0] = '\0';
uint8_t bad_table_marker[] = {98, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0};
r = q_decode(bad_table_marker, (int64_t)sizeof bad_table_marker, 0, err,
sizeof err);
ray_t *rs = r ? ray_fmt(r, 0) : NULL;
const char *rp = rs ? ray_str_ptr(rs) : err;
if (r == NULL || !RAY_IS_ERR(r) || strstr(rp, "q: malf") == NULL) {
fprintf(stderr, "codec selftest: malformed table marker was accepted\n");
failures++;
}
if (rs)
ray_release(rs);
release_any(r);

if (q_connect("127.0.0.1", 70000, "", "", 1) != Q_ERR_SOCKET) {
fprintf(stderr, "codec selftest: client accepted out-of-range port\n");
failures++;
Expand Down
Loading