ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lsmem: use ul_path_readf_string() readable for analysers [coverity scan] 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2021-03-25 12:23:21 +01:00
parent 01a895d840
commit 4397707e7a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys-utils/lsmem.c
View 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);
}
}