projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bad8e27
)
Check for malloc failures
author
Andrew Bays
<abays@redhat.com>
Wed, 18 Jul 2018 17:02:25 +0000
(13:02 -0400)
committer
Andrew Bays
<abays@redhat.com>
Wed, 18 Jul 2018 17:02:25 +0000
(13:02 -0400)
src/sysevent.c
patch
|
blob
|
history
diff --git
a/src/sysevent.c
b/src/sysevent.c
index
e7dfdab
..
4948b2b
100644
(file)
--- a/
src/sysevent.c
+++ b/
src/sysevent.c
@@
-400,6
+400,12
@@
static int gen_message_payload(const char *msg, char *sev, int sev_num,
*buf = malloc(strlen((char *)buf2) + 1);
*buf = malloc(strlen((char *)buf2) + 1);
+ if (*buf == NULL)
+ {
+ ERROR("sysevent plugin: gen_message_payload malloc failed");
+ goto err;
+ }
+
sstrncpy(*buf, (char *)buf2, strlen((char *)buf2) + 1);
yajl_gen_free(g);
sstrncpy(*buf, (char *)buf2, strlen((char *)buf2) + 1);
yajl_gen_free(g);
@@
-572,6
+578,12
@@
static int sysevent_init(void) /* {{{ */
ring.maxLen = buffer_length;
ring.buffer = (char **)malloc(buffer_length * sizeof(char *));
ring.maxLen = buffer_length;
ring.buffer = (char **)malloc(buffer_length * sizeof(char *));
+ if (ring.buffer == NULL)
+ {
+ ERROR("sysevent plugin: sysevent_init malloc failed");
+ return (-1);
+ }
+
for (int i = 0; i < buffer_length; i++) {
ring.buffer[i] = malloc(listen_buffer_size);
}
for (int i = 0; i < buffer_length; i++) {
ring.buffer[i] = malloc(listen_buffer_size);
}