eliminate extreme case NULL dereference
Costa Tsaousis (ktsaou) committed
Jan 15, 2017 at 07:06 UTC
704987e54e03b3c51b18071f6cd88061646064cc
1 file changed
+8
-9
src/sys_devices_system_edac_mc.c
+8
-9
@@ -131,12 +131,11 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
131
132
static RRDSET *ce_st = NULL;
133
134
- if(unlikely(!ce_st))
135
- ce_st = rrdset_find("mem.ecc_ce");
136
-
134
if(unlikely(!ce_st)) {
138
- ce_st = rrdset_create("mem", "ecc_ce", NULL, "ecc", NULL, "ECC Memory Correctable Errors", "errors", 6600
139
- , update_every, RRDSET_TYPE_LINE);
135
+ ce_st = rrdset_find("mem.ecc_ce");
136
+ if(unlikely(!ce_st))
137
+ ce_st = rrdset_create("mem", "ecc_ce", NULL, "ecc", NULL, "ECC Memory Correctable Errors", "errors",
138
+ 6600, update_every, RRDSET_TYPE_LINE);
139
140
for(m = mc_root; m; m = m->next)
141
if(m->ce_count_filename)
@@ -159,12 +158,12 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
158
159
static RRDSET *ue_st = NULL;
160
162
- if(unlikely(!ue_st))
161
+ if(unlikely(!ue_st)) {
162
ue_st = rrdset_find("mem.ecc_ue");
163
165
- if(unlikely(!ue_st)) {
166
- ue_st = rrdset_create("mem", "ecc_ue", NULL, "ecc", NULL, "ECC Memory Uncorrectable Errors", "errors", 6610
167
- , update_every, RRDSET_TYPE_LINE);
164
+ if(unlikely(!ue_st))
165
+ ue_st = rrdset_create("mem", "ecc_ue", NULL, "ecc", NULL, "ECC Memory Uncorrectable Errors", "errors",
166
+ 6610, update_every, RRDSET_TYPE_LINE);
167
168
for(m = mc_root; m; m = m->next)
169
if(m->ue_count_filename)