Skip to content

fix null point #2871

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 1 commit into from
Jul 1, 2026
Merged

fix null point #2871

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
5 changes: 5 additions & 0 deletions plugins/mqtt/mqtt_handle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,11 @@ void handle_write_req(neu_mqtt_qos_e qos, const char *topic,
}

for (size_t i = 0; i < wr->n_tags; i++) {
if (wr->tags[i]->name == NULL || wr->tags[i]->value == NULL) {
plog_error(plugin, "write request tag missing name/value");
model__write_request__free_unpacked(wr, NULL);
return;
}
if (strlen(wr->tags[i]->name) >= NEU_TAG_NAME_LEN) {
plog_error(plugin, "tag name too long");
model__write_request__free_unpacked(wr, NULL);
Expand Down
14 changes: 12 additions & 2 deletions src/parser/neu_json_global_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,12 @@ int neu_json_decode_global_config_req_subscriptions(

json_t *grp_array = json_object_get(sub_obj, "groups");
for (size_t j = 0; j < json_array_size(grp_array); ++j) {
p->app = strdup(json_string_value(app_obj));
const char *app_str = json_string_value(app_obj);
if (NULL == app_str) {
nlog_error("`app` field is not a string");
goto error;
}
p->app = strdup(app_str);
if (NULL == p->app) {
nlog_error("strdup fail");
goto error;
Expand Down Expand Up @@ -318,7 +323,12 @@ int neu_json_decode_global_config_req_settings(
goto error;
}

p->node = strdup(json_string_value(node_obj));
const char *node_str = json_string_value(node_obj);
if (NULL == node_str) {
nlog_error("`node` field is not a string");
goto error;
}
p->node = strdup(node_str);
if (NULL == p->node) {
nlog_error("strdup fail");
goto error;
Expand Down
4 changes: 4 additions & 0 deletions src/utils/cid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,10 @@ static int parse_ied(xmlNode *xml_ied, cid_ied_t *ied)
{
int ret = -1;
char *ied_name = (char *) xmlGetProp(xml_ied, (const xmlChar *) "name");
if (ied_name == NULL) {
nlog_warn("IED has no name attribute");
return -1;
}
if (strlen(ied_name) >= NEU_CID_IED_NAME_LEN) {
xmlFree(ied_name);
nlog_warn("IED name is too long");
Expand Down
48 changes: 48 additions & 0 deletions src/utils/json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_str.length > 0) {
ele->v.val_array_str.p_strs =
calloc(ele->v.val_array_str.length, sizeof(char *));
if (NULL == ele->v.val_array_str.p_strs) {
ele->v.val_array_str.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_str.length; i++) {
json_t * value = json_array_get(ob, i);
const char *str_val = json_string_value(value);
Expand All @@ -606,6 +610,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_bool.length > 0) {
ele->v.val_array_bool.bools =
calloc(ele->v.val_array_bool.length, sizeof(bool));
if (NULL == ele->v.val_array_bool.bools) {
ele->v.val_array_bool.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_bool.length; i++) {
json_t *value = json_array_get(ob, i);
ele->v.val_array_bool.bools[i] = json_boolean_value(value);
Expand All @@ -618,6 +626,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_uint8.length > 0) {
ele->v.val_array_uint8.u8s =
calloc(ele->v.val_array_uint8.length, sizeof(int8_t));
if (NULL == ele->v.val_array_uint8.u8s) {
ele->v.val_array_uint8.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_uint8.length; i++) {
json_t *value = json_array_get(ob, i);
if (json_is_real(value)) {
Expand All @@ -635,6 +647,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_int8.length > 0) {
ele->v.val_array_int8.i8s =
calloc(ele->v.val_array_int8.length, sizeof(int8_t));
if (NULL == ele->v.val_array_int8.i8s) {
ele->v.val_array_int8.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_int8.length; i++) {
json_t *value = json_array_get(ob, i);
if (json_is_real(value)) {
Expand All @@ -652,6 +668,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_uint16.length > 0) {
ele->v.val_array_uint16.u16s =
calloc(ele->v.val_array_uint16.length, sizeof(int16_t));
if (NULL == ele->v.val_array_uint16.u16s) {
ele->v.val_array_uint16.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_uint16.length; i++) {
json_t *value = json_array_get(ob, i);
if (json_is_real(value)) {
Expand All @@ -669,6 +689,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_int16.length > 0) {
ele->v.val_array_int16.i16s =
calloc(ele->v.val_array_int16.length, sizeof(int16_t));
if (NULL == ele->v.val_array_int16.i16s) {
ele->v.val_array_int16.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_int16.length; i++) {
json_t *value = json_array_get(ob, i);
if (json_is_real(value)) {
Expand All @@ -686,6 +710,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_uint32.length > 0) {
ele->v.val_array_uint32.u32s =
calloc(ele->v.val_array_uint32.length, sizeof(int32_t));
if (NULL == ele->v.val_array_uint32.u32s) {
ele->v.val_array_uint32.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_uint32.length; i++) {
json_t *value = json_array_get(ob, i);
if (json_is_real(value)) {
Expand All @@ -703,6 +731,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_int32.length > 0) {
ele->v.val_array_int32.i32s =
calloc(ele->v.val_array_int32.length, sizeof(int32_t));
if (NULL == ele->v.val_array_int32.i32s) {
ele->v.val_array_int32.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_int32.length; i++) {
json_t *value = json_array_get(ob, i);
if (json_is_real(value)) {
Expand All @@ -720,6 +752,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_uint64.length > 0) {
ele->v.val_array_uint64.u64s =
calloc(ele->v.val_array_uint64.length, sizeof(int64_t));
if (NULL == ele->v.val_array_uint64.u64s) {
ele->v.val_array_uint64.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_uint64.length; i++) {
json_t *value = json_array_get(ob, i);
if (json_is_real(value)) {
Expand All @@ -737,6 +773,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_int64.length > 0) {
ele->v.val_array_int64.i64s =
calloc(ele->v.val_array_int64.length, sizeof(int64_t));
if (NULL == ele->v.val_array_int64.i64s) {
ele->v.val_array_int64.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_int64.length; i++) {
json_t *value = json_array_get(ob, i);
if (json_is_real(value)) {
Expand All @@ -754,6 +794,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_float.length > 0) {
ele->v.val_array_float.f32s =
calloc(ele->v.val_array_float.length, sizeof(float));
if (NULL == ele->v.val_array_float.f32s) {
ele->v.val_array_float.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_float.length; i++) {
json_t *value = json_array_get(ob, i);
if (json_is_integer(value)) {
Expand All @@ -771,6 +815,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
if (ele->v.val_array_double.length > 0) {
ele->v.val_array_double.f64s =
calloc(ele->v.val_array_double.length, sizeof(double));
if (NULL == ele->v.val_array_double.f64s) {
ele->v.val_array_double.length = 0;
break;
}
for (int i = 0; i < ele->v.val_array_double.length; i++) {
json_t *value = json_array_get(ob, i);
if (json_is_integer(value)) {
Expand Down
Loading