Skip to content

Commit aa4bbe0

Browse files
authored
lib REFACTOR safety checks (#548)
1 parent 61fbe73 commit aa4bbe0

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/io.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,14 +649,14 @@ nc_write_starttag_and_msg(struct nc_session *session, const void *buf, uint32_t
649649
r = sprintf(chunksize, "\n#%" PRIu32 "\n", count);
650650

651651
r = nc_write(session, chunksize, r);
652-
if (r == -1) {
652+
if (r < 0) {
653653
return -1;
654654
}
655655
ret += r;
656656
}
657657

658658
r = nc_write(session, buf, count);
659-
if (r == -1) {
659+
if (r < 0) {
660660
return -1;
661661
}
662662
ret += r;

src/server_config.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2631,6 +2631,7 @@ nc_server_config_endpoint_reference(const struct lyd_node *node, enum nc_operati
26312631
endpt->referenced_endpt_name = NULL;
26322632
} else {
26332633
/* call home */
2634+
assert(ch_endpt);
26342635
free(ch_endpt->referenced_endpt_name);
26352636
ch_endpt->referenced_endpt_name = NULL;
26362637
}
@@ -2658,6 +2659,7 @@ nc_server_config_endpoint_reference(const struct lyd_node *node, enum nc_operati
26582659
endpt->referenced_endpt_name = strdup(lyd_get_value(node));
26592660
NC_CHECK_ERRMEM_GOTO(!endpt->referenced_endpt_name, ret = 1, cleanup);
26602661
} else {
2662+
assert(ch_endpt);
26612663
free(ch_endpt->referenced_endpt_name);
26622664
ch_endpt->referenced_endpt_name = strdup(lyd_get_value(node));
26632665
NC_CHECK_ERRMEM_GOTO(!ch_endpt->referenced_endpt_name, ret = 1, cleanup);

src/session_server.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4072,7 +4072,9 @@ nc_server_notif_cert_exp_thread(void *arg)
40724072
if (targ->clb_free_data) {
40734073
targ->clb_free_data(targ->clb_data);
40744074
}
4075-
nc_server_notif_cert_exp_dates_destroy(exp_dates, exp_date_count);
4075+
if (exp_dates) {
4076+
nc_server_notif_cert_exp_dates_destroy(exp_dates, exp_date_count);
4077+
}
40764078
free(targ);
40774079
return NULL;
40784080
}

0 commit comments

Comments
 (0)