Skip to content

core: fix empty array write memory leak && fix(driver): accept UINT64 write values for numeric tags #2962

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
fengzeroz merged 2 commits into from
Nov 13, 2026
Merged

core: fix empty array write memory leak && fix(driver): accept UINT64 write values for numeric tags #2962

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
c20a146
core: fix empty array write memory leak
ZhouBox Nov 12, 2026
3b72cc7
fix(driver): accept UINT64 write values for numeric tags
ZhouBox Nov 13, 2026
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
35 changes: 35 additions & 0 deletions include/neuron/msg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ extern "C" {

#include <pthread.h>
#include <stdint.h>
#include <string.h>

#include "json/neu_json_rw.h"

Expand Down Expand Up @@ -1104,6 +1105,12 @@ static inline void neu_req_write_tag_fini(neu_req_write_tag_t *req)
free(req->tag);
}

static inline void neu_req_write_tag_value_fini(neu_req_write_tag_t *req)
{
neu_free_dvalue(&req->value);
memset(&req->value, 0, sizeof(req->value));
}

typedef struct neu_resp_tag_value {
char tag[NEU_TAG_NAME_LEN];
neu_dvalue_t value;
Expand Down Expand Up @@ -1150,6 +1157,17 @@ static inline void neu_req_write_tags_fini(neu_req_write_tags_t *req)
free(req->tags);
}

static inline void neu_req_write_tags_value_fini(neu_req_write_tags_t *req)
{
if (req->tags == NULL) {
return;
}
for (int i = 0; i < req->n_tag; ++i) {
neu_free_dvalue(&req->tags[i].value);
memset(&req->tags[i].value, 0, sizeof(req->tags[i].value));
}
}

typedef struct {
char *group;

Expand Down Expand Up @@ -1179,6 +1197,23 @@ static inline void neu_req_write_gtags_fini(neu_req_write_gtags_t *req)
free(req->groups);
}

static inline void neu_req_write_gtags_value_fini(neu_req_write_gtags_t *req)
{
if (req->groups == NULL) {
return;
}
for (int i = 0; i < req->n_group; ++i) {
if (req->groups[i].tags == NULL) {
continue;
}
for (int k = 0; k < req->groups[i].n_tag; ++k) {
neu_free_dvalue(&req->groups[i].tags[k].value);
memset(&req->groups[i].tags[k].value, 0,
sizeof(req->groups[i].tags[k].value));
}
}
}

typedef struct {
char *driver;
char *group;
Expand Down
200 changes: 108 additions & 92 deletions plugins/restful/rw_handle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,43 +331,50 @@ void handle_write(nng_aio *aio)
case NEU_JSON_ARRAY_INT64:
cmd.value.type = NEU_TYPE_ARRAY_INT64;
cmd.value.value.i64s.length = req->value.val_array_int64.length;
cmd.value.value.i64s.i64s =
calloc(req->value.val_array_int64.length, sizeof(int64_t));
for (size_t i = 0; i < req->value.val_array_int64.length; i++) {
cmd.value.value.i64s.i64s[i] =
req->value.val_array_int64.i64s[i];
if (cmd.value.value.i64s.length > 0) {
cmd.value.value.i64s.i64s =
calloc(cmd.value.value.i64s.length, sizeof(int64_t));
for (size_t i = 0; i < cmd.value.value.i64s.length; i++) {
cmd.value.value.i64s.i64s[i] =
req->value.val_array_int64.i64s[i];
}
}
break;
case NEU_JSON_ARRAY_DOUBLE:
cmd.value.type = NEU_TYPE_ARRAY_DOUBLE;
cmd.value.value.f64s.length =
req->value.val_array_double.length;
cmd.value.value.f64s.f64s =
calloc(req->value.val_array_double.length, sizeof(double));
for (size_t i = 0; i < req->value.val_array_double.length;
i++) {
cmd.value.value.f64s.f64s[i] =
req->value.val_array_double.f64s[i];
if (cmd.value.value.f64s.length > 0) {
cmd.value.value.f64s.f64s =
calloc(cmd.value.value.f64s.length, sizeof(double));
for (size_t i = 0; i < cmd.value.value.f64s.length; i++) {
cmd.value.value.f64s.f64s[i] =
req->value.val_array_double.f64s[i];
}
}
break;
case NEU_JSON_ARRAY_BOOL:
cmd.value.type = NEU_TYPE_ARRAY_BOOL;
cmd.value.value.bools.length = req->value.val_array_bool.length;
cmd.value.value.bools.bools =
calloc(req->value.val_array_bool.length, sizeof(bool));
for (size_t i = 0; i < req->value.val_array_bool.length; i++) {
cmd.value.value.bools.bools[i] =
req->value.val_array_bool.bools[i];
if (cmd.value.value.bools.length > 0) {
cmd.value.value.bools.bools =
calloc(cmd.value.value.bools.length, sizeof(bool));
for (size_t i = 0; i < cmd.value.value.bools.length; i++) {
cmd.value.value.bools.bools[i] =
req->value.val_array_bool.bools[i];
}
}
break;
case NEU_JSON_ARRAY_STR:
cmd.value.type = NEU_TYPE_ARRAY_STRING;
cmd.value.value.strs.length = req->value.val_array_str.length;
cmd.value.value.strs.strs =
calloc(req->value.val_array_str.length, sizeof(char *));
for (size_t i = 0; i < req->value.val_array_str.length; i++) {
const char *s = req->value.val_array_str.p_strs[i];
cmd.value.value.strs.strs[i] = strdup(s ? s : "");
if (cmd.value.value.strs.length > 0) {
cmd.value.value.strs.strs =
calloc(cmd.value.value.strs.length, sizeof(char *));
for (size_t i = 0; i < cmd.value.value.strs.length; i++) {
const char *s = req->value.val_array_str.p_strs[i];
cmd.value.value.strs.strs[i] = strdup(s ? s : "");
}
}
break;
case NEU_JSON_OBJECT:
Expand All @@ -389,6 +396,7 @@ void handle_write(nng_aio *aio)
}

if (ret != 0) {
neu_req_write_tag_value_fini(&cmd);
neu_req_write_tag_fini(&cmd);
NEU_JSON_RESPONSE_ERROR(NEU_ERR_IS_BUSY, {
neu_http_response(aio, NEU_ERR_IS_BUSY, result_error);
Expand Down Expand Up @@ -549,50 +557,58 @@ void handle_write_tags(nng_aio *aio)
cmd.tags[i].value.type = NEU_TYPE_ARRAY_INT64;
cmd.tags[i].value.value.i64s.length =
req->tags[i].value.val_array_int64.length;
cmd.tags[i].value.value.i64s.i64s =
calloc(req->tags[i].value.val_array_int64.length,
sizeof(int64_t));
memcpy(cmd.tags[i].value.value.i64s.i64s,
req->tags[i].value.val_array_int64.i64s,
sizeof(int64_t) *
req->tags[i].value.val_array_int64.length);
if (cmd.tags[i].value.value.i64s.length > 0) {
cmd.tags[i].value.value.i64s.i64s =
calloc(cmd.tags[i].value.value.i64s.length,
sizeof(int64_t));
memcpy(cmd.tags[i].value.value.i64s.i64s,
req->tags[i].value.val_array_int64.i64s,
sizeof(int64_t) *
cmd.tags[i].value.value.i64s.length);
}
break;
case NEU_JSON_ARRAY_DOUBLE:
cmd.tags[i].value.type = NEU_TYPE_ARRAY_DOUBLE;
cmd.tags[i].value.value.f64s.length =
req->tags[i].value.val_array_double.length;
cmd.tags[i].value.value.f64s.f64s =
calloc(req->tags[i].value.val_array_double.length,
sizeof(double));
memcpy(cmd.tags[i].value.value.f64s.f64s,
req->tags[i].value.val_array_double.f64s,
sizeof(double) *
req->tags[i].value.val_array_double.length);
if (cmd.tags[i].value.value.f64s.length > 0) {
cmd.tags[i].value.value.f64s.f64s =
calloc(cmd.tags[i].value.value.f64s.length,
sizeof(double));
memcpy(cmd.tags[i].value.value.f64s.f64s,
req->tags[i].value.val_array_double.f64s,
sizeof(double) *
cmd.tags[i].value.value.f64s.length);
}
break;
case NEU_JSON_ARRAY_BOOL:
cmd.tags[i].value.type = NEU_TYPE_ARRAY_BOOL;
cmd.tags[i].value.value.bools.length =
req->tags[i].value.val_array_bool.length;
cmd.tags[i].value.value.bools.bools = calloc(
req->tags[i].value.val_array_bool.length, sizeof(bool));
memcpy(cmd.tags[i].value.value.bools.bools,
req->tags[i].value.val_array_bool.bools,
sizeof(bool) *
req->tags[i].value.val_array_bool.length);
if (cmd.tags[i].value.value.bools.length > 0) {
cmd.tags[i].value.value.bools.bools = calloc(
cmd.tags[i].value.value.bools.length, sizeof(bool));
memcpy(cmd.tags[i].value.value.bools.bools,
req->tags[i].value.val_array_bool.bools,
sizeof(bool) *
cmd.tags[i].value.value.bools.length);
}
break;
case NEU_JSON_ARRAY_STR:
cmd.tags[i].value.type = NEU_TYPE_ARRAY_STRING;
cmd.tags[i].value.value.strs.length =
req->tags[i].value.val_array_str.length;
cmd.tags[i].value.value.strs.strs =
calloc(req->tags[i].value.val_array_str.length,
sizeof(char *));
for (size_t k = 0;
k < req->tags[i].value.val_array_str.length; k++) {
const char *s =
req->tags[i].value.val_array_str.p_strs[k];
cmd.tags[i].value.value.strs.strs[k] =
strdup(s ? s : "");
if (cmd.tags[i].value.value.strs.length > 0) {
cmd.tags[i].value.value.strs.strs =
calloc(cmd.tags[i].value.value.strs.length,
sizeof(char *));
for (size_t k = 0;
k < cmd.tags[i].value.value.strs.length; k++) {
const char *s =
req->tags[i].value.val_array_str.p_strs[k];
cmd.tags[i].value.value.strs.strs[k] =
strdup(s ? s : "");
}
}
break;
case NEU_JSON_OBJECT:
Expand All @@ -616,6 +632,7 @@ void handle_write_tags(nng_aio *aio)
}

if (ret != 0) {
neu_req_write_tags_value_fini(&cmd);
neu_req_write_tags_fini(&cmd);
NEU_JSON_RESPONSE_ERROR(NEU_ERR_IS_BUSY, {
neu_http_response(aio, NEU_ERR_IS_BUSY, result_error);
Expand Down Expand Up @@ -683,64 +700,62 @@ static void trans(neu_json_write_gtags_req_t *req, neu_req_write_gtags_t *cmd)
cmd->groups[i].tags[k].value.type = NEU_TYPE_ARRAY_INT64;
cmd->groups[i].tags[k].value.value.i64s.length =
req->groups[i].tags[k].value.val_array_int64.length;

cmd->groups[i].tags[k].value.value.i64s.i64s =
calloc(req->groups[i].tags[k].value.val_array_int64.length,
sizeof(int64_t));

memcpy(cmd->groups[i].tags[k].value.value.i64s.i64s,
req->groups[i].tags[k].value.val_array_int64.i64s,
sizeof(int64_t) *
req->groups[i].tags[k].value.val_array_int64.length);

if (cmd->groups[i].tags[k].value.value.i64s.length > 0) {
cmd->groups[i].tags[k].value.value.i64s.i64s =
calloc(cmd->groups[i].tags[k].value.value.i64s.length,
sizeof(int64_t));
memcpy(cmd->groups[i].tags[k].value.value.i64s.i64s,
req->groups[i].tags[k].value.val_array_int64.i64s,
sizeof(int64_t) *
cmd->groups[i].tags[k].value.value.i64s.length);
}
break;
case NEU_JSON_ARRAY_DOUBLE:
cmd->groups[i].tags[k].value.type = NEU_TYPE_ARRAY_DOUBLE;
cmd->groups[i].tags[k].value.value.f64s.length =
req->groups[i].tags[k].value.val_array_double.length;

cmd->groups[i].tags[k].value.value.f64s.f64s = calloc(

req->groups[i].tags[k].value.val_array_double.length,
sizeof(double));
memcpy(
cmd->groups[i].tags[k].value.value.f64s.f64s,
req->groups[i].tags[k].value.val_array_double.f64s,
sizeof(double) *
req->groups[i].tags[k].value.val_array_double.length);

if (cmd->groups[i].tags[k].value.value.f64s.length > 0) {
cmd->groups[i].tags[k].value.value.f64s.f64s =
calloc(cmd->groups[i].tags[k].value.value.f64s.length,
sizeof(double));
memcpy(cmd->groups[i].tags[k].value.value.f64s.f64s,
req->groups[i].tags[k].value.val_array_double.f64s,
sizeof(double) *
cmd->groups[i].tags[k].value.value.f64s.length);
}
break;
case NEU_JSON_ARRAY_BOOL:
cmd->groups[i].tags[k].value.type = NEU_TYPE_ARRAY_BOOL;
cmd->groups[i].tags[k].value.value.bools.length =
req->groups[i].tags[k].value.val_array_bool.length;

cmd->groups[i].tags[k].value.value.bools.bools =
calloc(sizeof(bool),
req->groups[i].tags[k].value.val_array_bool.length);
memcpy(cmd->groups[i].tags[k].value.value.bools.bools,
req->groups[i].tags[k].value.val_array_bool.bools,
sizeof(bool) *
req->groups[i].tags[k].value.val_array_bool.length);

if (cmd->groups[i].tags[k].value.value.bools.length > 0) {
cmd->groups[i].tags[k].value.value.bools.bools =
calloc(cmd->groups[i].tags[k].value.value.bools.length,
sizeof(bool));
memcpy(cmd->groups[i].tags[k].value.value.bools.bools,
req->groups[i].tags[k].value.val_array_bool.bools,
sizeof(bool) *
cmd->groups[i].tags[k].value.value.bools.length);
}
break;
case NEU_JSON_ARRAY_STR:
cmd->groups[i].tags[k].value.type = NEU_TYPE_ARRAY_STRING;
cmd->groups[i].tags[k].value.value.strs.length =
req->groups[i].tags[k].value.val_array_str.length;

cmd->groups[i].tags[k].value.value.strs.strs =
calloc(req->groups[i].tags[k].value.val_array_str.length,
sizeof(char *));
for (size_t j = 0;
j < req->groups[i].tags[k].value.val_array_str.length;
j++) {
const char *s =
req->groups[i].tags[k].value.val_array_str.p_strs[j];
cmd->groups[i].tags[k].value.value.strs.strs[j] =
strdup(s ? s : "");
if (cmd->groups[i].tags[k].value.value.strs.length > 0) {
cmd->groups[i].tags[k].value.value.strs.strs =
calloc(cmd->groups[i].tags[k].value.value.strs.length,
sizeof(char *));
for (size_t j = 0;
j < cmd->groups[i].tags[k].value.value.strs.length;
j++) {
const char *s = req->groups[i]
.tags[k]
.value.val_array_str.p_strs[j];
cmd->groups[i].tags[k].value.value.strs.strs[j] =
strdup(s ? s : "");
}
}

break;
case NEU_JSON_OBJECT:
cmd->groups[i].tags[k].value.type = NEU_TYPE_CUSTOM;
Expand Down Expand Up @@ -839,6 +854,7 @@ void handle_write_gtags(nng_aio *aio)
}

if (ret != 0) {
neu_req_write_gtags_value_fini(&cmd);
neu_req_write_gtags_fini(&cmd);
NEU_JSON_RESPONSE_ERROR(NEU_ERR_IS_BUSY, {
neu_http_response(aio, NEU_ERR_IS_BUSY, result_error);
Expand Down
4 changes: 4 additions & 0 deletions src/adapter/adapter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,6 +1233,7 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
}
}
} else {
neu_req_write_tag_value_fini((neu_req_write_tag_t *) &header[1]);
neu_req_write_tag_fini((neu_req_write_tag_t *) &header[1]);
error.error = NEU_ERR_GROUP_NOT_ALLOW;
header->type = NEU_RESP_ERROR;
Expand Down Expand Up @@ -1279,6 +1280,7 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
bool re_flag = false;

if (adapter->module->type != NEU_NA_TYPE_DRIVER) {
neu_req_write_tags_value_fini((neu_req_write_tags_t *) &header[1]);
neu_req_write_tags_fini((neu_req_write_tags_t *) &header[1]);
error.error = NEU_ERR_GROUP_NOT_ALLOW;
header->type = NEU_RESP_ERROR;
Expand Down Expand Up @@ -1344,6 +1346,8 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
bool re_flag = false;

if (adapter->module->type != NEU_NA_TYPE_DRIVER) {
neu_req_write_gtags_value_fini(
(neu_req_write_gtags_t *) &header[1]);
neu_req_write_gtags_fini((neu_req_write_gtags_t *) &header[1]);
error.error = NEU_ERR_GROUP_NOT_ALLOW;
header->type = NEU_RESP_ERROR;
Expand Down
Loading
Loading