]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
lsmem: use ul_path_readf_string() readable for analysers [coverity scan]
authorKarel Zak <kzak@redhat.com>
Thu, 25 Mar 2021 11:23:21 +0000 (12:23 +0100)
committerKarel Zak <kzak@redhat.com>
Thu, 25 Mar 2021 11:23:21 +0000 (12:23 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
sys-utils/lsmem.c

index 00f9d769c3ab99c6d43c2d322b7ae06fc5a85d66..0b3d3ed12cf8232d9f7fd19fa5a6999cede7f2b7 100644 (file)
@@ -370,7 +370,7 @@ static void memory_block_read_attrs(struct lsmem *lsmem, char *name,
        if (ul_path_readf_s32(lsmem->sysmem, &x, "%s/removable", name) == 0)
                blk->removable = x == 1;
 
-       if (ul_path_readf_string(lsmem->sysmem, &line, "%s/state", name) > 0) {
+       if (ul_path_readf_string(lsmem->sysmem, &line, "%s/state", name) > 0 && line) {
                if (strcmp(line, "offline") == 0)
                        blk->state = MEMORY_STATE_OFFLINE;
                else if (strcmp(line, "online") == 0)
@@ -384,8 +384,9 @@ static void memory_block_read_attrs(struct lsmem *lsmem, char *name,
                blk->node = memory_block_get_node(lsmem, name);
 
        blk->nr_zones = 0;
-       if (lsmem->have_zones &&
-           ul_path_readf_string(lsmem->sysmem, &line, "%s/valid_zones", name) > 0) {
+       if (lsmem->have_zones
+           && ul_path_readf_string(lsmem->sysmem, &line, "%s/valid_zones", name) > 0
+           && line) {
 
                char *token = strtok(line, " ");
 
@@ -394,7 +395,6 @@ static void memory_block_read_attrs(struct lsmem *lsmem, char *name,
                        blk->nr_zones++;
                        token = strtok(NULL, " ");
                }
-
                free(line);
        }
 }