Skip to content

Commit 364ed2e

Browse files
committed
out_syslog: Safe guard against invalid pointers
Signed-off-by: Simon Bouchard <sbouchard@rbbn.com>
1 parent ca960b0 commit 364ed2e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

plugins/out_syslog/syslog.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ static int msgpack_to_syslog(struct flb_syslog *ctx, msgpack_object *o,
669669
if (rval) {
670670
val = temp;
671671
extract_value_from_ra_result(rval, &val, sizeof(temp) - 1, &val_len);
672-
if (!msg->hostname) {
672+
if (!msg->hostname && val != NULL) {
673673
msg->hostname = flb_sds_create_len(val, val_len);
674674
}
675675
flb_ra_key_value_destroy(rval);
@@ -681,7 +681,7 @@ static int msgpack_to_syslog(struct flb_syslog *ctx, msgpack_object *o,
681681
if (rval) {
682682
val = temp;
683683
extract_value_from_ra_result(rval, &val, sizeof(temp) - 1, &val_len);
684-
if (!msg->appname) {
684+
if (!msg->appname && val != NULL) {
685685
msg->appname = flb_sds_create_len(val, val_len);
686686
}
687687
flb_ra_key_value_destroy(rval);
@@ -693,7 +693,7 @@ static int msgpack_to_syslog(struct flb_syslog *ctx, msgpack_object *o,
693693
if (rval) {
694694
val = temp;
695695
extract_value_from_ra_result(rval, &val, sizeof(temp) - 1, &val_len);
696-
if (!msg->procid) {
696+
if (!msg->procid && val != NULL) {
697697
msg->procid = flb_sds_create_len(val, val_len);
698698
}
699699
flb_ra_key_value_destroy(rval);
@@ -705,7 +705,7 @@ static int msgpack_to_syslog(struct flb_syslog *ctx, msgpack_object *o,
705705
if (rval) {
706706
val = temp;
707707
extract_value_from_ra_result(rval, &val, sizeof(temp) - 1, &val_len);
708-
if (!msg->msgid) {
708+
if (!msg->msgid && val != NULL) {
709709
msg->msgid = flb_sds_create_len(val, val_len);
710710
}
711711
flb_ra_key_value_destroy(rval);
@@ -717,7 +717,7 @@ static int msgpack_to_syslog(struct flb_syslog *ctx, msgpack_object *o,
717717
if (rval) {
718718
val = temp;
719719
extract_value_from_ra_result(rval, &val, sizeof(temp) - 1, &val_len);
720-
if (!msg->message) {
720+
if (!msg->message && val != NULL) {
721721
msg->message = flb_sds_create_len(val, val_len);
722722
}
723723
flb_ra_key_value_destroy(rval);

0 commit comments

Comments
 (0)