Skip to content
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

Fixed unsafe string dup behaviour. #153

Merged
merged 3 commits into from
Mar 31, 2023
Merged

Fixed unsafe string dup behaviour. #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e149f12
* FIX [mqtt_msg.*] fixed unsafe string dup behaviour.
xinyi-xs Mar 30, 2023
5ddd680
* MDF [mqtt] sync interface.
xinyi-xs Mar 30, 2023
4c6a5a7
* FIX [mqtt_msg.c] fixed free error.
xinyi-xs Mar 31, 2023
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
2 changes: 1 addition & 1 deletion include/nng/mqtt/mqtt_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ NNG_DECL void nng_mqtt_topic_array_set(nng_mqtt_topic *, size_t, const char *);
NNG_DECL void nng_mqtt_topic_array_free(nng_mqtt_topic *, size_t);
NNG_DECL nng_mqtt_topic_qos *nng_mqtt_topic_qos_array_create(size_t);
NNG_DECL void nng_mqtt_topic_qos_array_set(nng_mqtt_topic_qos *, size_t,
const char *, uint8_t, uint8_t, uint8_t, uint8_t);
const char *, uint32_t, uint8_t, uint8_t, uint8_t, uint8_t);
NNG_DECL void nng_mqtt_topic_qos_array_free(nng_mqtt_topic_qos *, size_t);
NNG_DECL int nng_mqtt_set_connect_cb(nng_socket, nng_pipe_cb, void *);
NNG_DECL int nng_mqtt_set_disconnect_cb(nng_socket, nng_pipe_cb, void *);
Expand Down
1 change: 1 addition & 0 deletions src/supplemental/mqtt/mqtt_codec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,7 @@ dup_subscribe(nni_mqtt_proto_data *dest, nni_mqtt_proto_data *src)
for (size_t i = 0; i < src->payload.subscribe.topic_count; i++) {
nni_mqtt_topic_qos_array_set(dest->payload.subscribe.topic_arr,
i, (const char *) src->payload.subscribe.topic_arr[i].topic.buf,
src->payload.subscribe.topic_arr[i].topic.length,
src->payload.subscribe.topic_arr[i].qos,
src->payload.subscribe.topic_arr[i].nolocal,
src->payload.subscribe.topic_arr[i].rap,
Expand Down
11 changes: 6 additions & 5 deletions src/supplemental/mqtt/mqtt_msg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ nni_mqtt_msg_set_subscribe_topics(
for (size_t i = 0; i < topic_count; i++) {
nni_mqtt_topic_qos_array_set(
proto_data->payload.subscribe.topic_arr, i,
(const char *) topics[i].topic.buf, topics[i].qos,
(const char *) topics[i].topic.buf, topics[i].topic.length, topics[i].qos,
topics[i].nolocal, topics[i].rap, topics[i].retain_handling);
}
}
Expand Down Expand Up @@ -828,10 +828,11 @@ nni_mqtt_topic_qos_array_create(size_t n)

void
nni_mqtt_topic_qos_array_set(nni_mqtt_topic_qos *topic_qos, size_t index,
const char *topic_name, uint8_t qos, uint8_t nl, uint8_t rap, uint8_t rh)
const char *topic_name, uint32_t len, uint8_t qos, uint8_t nl, uint8_t rap, uint8_t rh)
{
topic_qos[index].topic.buf = (uint8_t *) nni_strdup(topic_name);
topic_qos[index].topic.length = (uint32_t) strlen(topic_name);
topic_qos[index].topic.buf = (uint8_t *) nni_alloc(len * sizeof(uint8_t));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just use function strndup()?

memcpy(topic_qos[index].topic.buf, topic_name, len);
topic_qos[index].topic.length = len;
topic_qos[index].qos = qos;
topic_qos[index].nolocal = nl;
topic_qos[index].rap = rap;
Expand All @@ -842,7 +843,7 @@ void
nni_mqtt_topic_qos_array_free(nni_mqtt_topic_qos *topic_qos, size_t n)
{
for (size_t i = 0; i < n; i++) {
nni_strfree((char *) topic_qos[i].topic.buf);
nni_free(topic_qos[i].topic.buf, topic_qos[i].topic.length);
topic_qos[i].topic.length = 0;
}
NNI_FREE_STRUCTS(topic_qos, n);
Expand Down
2 changes: 1 addition & 1 deletion src/supplemental/mqtt/mqtt_msg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ NNG_DECL void nni_mqtt_topic_array_free(nni_mqtt_topic *, size_t);
// mqtt topic_qos create/free/set
NNG_DECL nni_mqtt_topic_qos *nni_mqtt_topic_qos_array_create(size_t);
NNG_DECL void nni_mqtt_topic_qos_array_set(nni_mqtt_topic_qos *,
size_t, const char *, uint8_t, uint8_t, uint8_t, uint8_t);
size_t, const char *, uint32_t, uint8_t, uint8_t, uint8_t, uint8_t);
NNG_DECL void nni_mqtt_topic_qos_array_free(nni_mqtt_topic_qos *, size_t);

NNG_DECL void mqtt_close_unack_msg_cb(void *, void *);
Expand Down
4 changes: 2 additions & 2 deletions src/supplemental/mqtt/mqtt_public.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,9 +631,9 @@ nng_mqtt_topic_qos_array_create(size_t n)
*/
void
nng_mqtt_topic_qos_array_set(nng_mqtt_topic_qos *topic_qos, size_t index,
const char *topic_name, uint8_t qos, uint8_t nolocal, uint8_t rap, uint8_t rh)
const char *topic_name, uint32_t len, uint8_t qos, uint8_t nolocal, uint8_t rap, uint8_t rh)
{
nni_mqtt_topic_qos_array_set(topic_qos, index, topic_name, qos, nolocal, rap, rh);
nni_mqtt_topic_qos_array_set(topic_qos, index, topic_name, len, qos, nolocal, rap, rh);
}

void
Expand Down