projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4' into collectd-5.5
[collectd.git]
/
src
/
zfs_arc.c
diff --git
a/src/zfs_arc.c
b/src/zfs_arc.c
index
f0d2323
..
ab5cd64
100644
(file)
--- a/
src/zfs_arc.c
+++ b/
src/zfs_arc.c
@@
-186,7
+186,7
@@
static int za_read (void)
return (-1);
}
return (-1);
}
- len = read_file_contents (ZOL_ARCSTATS_FILE, file_contents, sizeof(file_contents));
+ len = read_file_contents (ZOL_ARCSTATS_FILE, file_contents, sizeof(file_contents)
- 1
);
if (len > 1)
{
if (len > 1)
{
@@
-208,6
+208,12
@@
static int za_read (void)
{
llentry_t *e;
llvalues = malloc(sizeof(long long int) * i);
{
llentry_t *e;
llvalues = malloc(sizeof(long long int) * i);
+ if (llvalues == NULL)
+ {
+ ERROR ("zfs_arc plugin: `malloc' failed.");
+ llist_destroy (ksp);
+ return (-1);
+ }
int j = 0;
pnl = file_contents;
int j = 0;
pnl = file_contents;