Skip to content

event_rabbitmq: fix dupl_string() NUL-inclusive len corrupting AMQP shortstr #3834

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

Open
NormB wants to merge 1 commit into
base: master
Choose a base branch
from
Open

event_rabbitmq: fix dupl_string() NUL-inclusive len corrupting AMQP shortstr #3834

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
22 changes: 12 additions & 10 deletions modules/event_rabbitmq/event_rabbitmq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,12 +336,15 @@ static inline int dupl_string(str* dst, const char* begin, const char* end)
return -1;
}

if (un_escape(&tmp, dst) < 0)
if (un_escape(&tmp, dst) < 0) {
shm_free(dst->s);
dst->s = NULL;
dst->len = 0;
return -1;
}

/* NULL-terminate the string */
dst->s[dst->len] = 0;
dst->len++;

return 0;
}
Expand Down Expand Up @@ -516,7 +519,6 @@ static evi_reply_sock* rmq_parse(str socket)
if (dupl_string(&param->conn.tls_dom_name,
it->s.s+RMQ_TLS_DOM_LEN, it->s.s + it->s.len) < 0)
goto err;
param->conn.tls_dom_name.len--;
param->conn.flags |= RMQ_PARAM_TLS;
} else if (it->s.len == RMQ_PERSISTENT_LEN &&
!memcmp(it->s.s, RMQ_PERSISTENT_S, RMQ_PERSISTENT_LEN)) {
Expand Down Expand Up @@ -558,11 +560,11 @@ static evi_reply_sock* rmq_parse(str socket)
sock->flags |= EVI_PORT;
}
if (!(param->conn.flags & RMQ_PARAM_USER) || !param->conn.uri.user) {
param->conn.uri.user = shm_malloc(rmq_static_holder.len);
param->conn.uri.user = shm_malloc(rmq_static_holder.len + 1);
if (!param->conn.uri.user) {
goto err;
}
memcpy(param->conn.uri.user, rmq_static_holder.s, rmq_static_holder.len);
memcpy(param->conn.uri.user, rmq_static_holder.s, rmq_static_holder.len + 1);
param->conn.uri.password = param->conn.uri.user;
param->conn.flags |= RMQ_PARAM_USER|RMQ_PARAM_PASS;
}
Expand Down Expand Up @@ -660,21 +662,21 @@ static str rmq_print(evi_reply_sock *sock)

param = sock->params;
if (param->conn.flags & RMQ_PARAM_USER) {
DO_PRINT(param->conn.uri.user, strlen(param->conn.uri.user) - 1 /* skip 0 */);
DO_PRINT(param->conn.uri.user, strlen(param->conn.uri.user));
DO_PRINT("@", 1);
}
if (sock->flags & EVI_ADDRESS)
DO_PRINT(sock->address.s, sock->address.len - 1);
DO_PRINT(sock->address.s, sock->address.len);

DO_PRINT("/", 1); /* needs to be changed if it can print a key without RMQ_PARAM_RKEY */

if (param->conn.flags & RMQ_PARAM_EKEY) {
DO_PRINT(param->conn.exchange.bytes, param->conn.exchange.len - 1);
DO_PRINT(param->conn.exchange.bytes, param->conn.exchange.len);
DO_PRINT("?", 1);
}

if (param->conn.flags & RMQF_MAND) {
DO_PRINT(param->routing_key.s, param->routing_key.len - 1);
DO_PRINT(param->routing_key.s, param->routing_key.len);
}
end:
return rmq_print_s;
Expand Down