eliminate extreme case NULL dereference

diff --git a/src/sys_devices_system_edac_mc.c b/src/sys_devices_system_edac_mc.c
index 1e1aa9c7584a74f201fd8f4394b71e39f47c24e3..868329e3ade696bb034a4a1ddd76966248368e59 100644 (file)
--- a/src/sys_devices_system_edac_mc.c
+++ b/src/sys_devices_system_edac_mc.c
@@ -131,12 +131,11 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
 
         static RRDSET *ce_st = NULL;
 
-        if(unlikely(!ce_st))
-            ce_st = rrdset_find("mem.ecc_ce");
-
         if(unlikely(!ce_st)) {
-            ce_st = rrdset_create("mem", "ecc_ce", NULL, "ecc", NULL, "ECC Memory Correctable Errors", "errors", 6600
-                                  , update_every, RRDSET_TYPE_LINE);
+            ce_st = rrdset_find("mem.ecc_ce");
+            if(unlikely(!ce_st))
+                ce_st = rrdset_create("mem", "ecc_ce", NULL, "ecc", NULL, "ECC Memory Correctable Errors", "errors",
+                        6600, update_every, RRDSET_TYPE_LINE);
 
             for(m = mc_root; m; m = m->next)
                 if(m->ce_count_filename)
@@ -159,12 +158,12 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
 
         static RRDSET *ue_st = NULL;
 
-        if(unlikely(!ue_st))
+        if(unlikely(!ue_st)) {
             ue_st = rrdset_find("mem.ecc_ue");
 
-        if(unlikely(!ue_st)) {
-            ue_st = rrdset_create("mem", "ecc_ue", NULL, "ecc", NULL, "ECC Memory Uncorrectable Errors", "errors", 6610
-                                  , update_every, RRDSET_TYPE_LINE);
+            if(unlikely(!ue_st))
+                ue_st = rrdset_create("mem", "ecc_ue", NULL, "ecc", NULL, "ECC Memory Uncorrectable Errors", "errors",
+                        6610, update_every, RRDSET_TYPE_LINE);
 
             for(m = mc_root; m; m = m->next)
                 if(m->ue_count_filename)