shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

gcc: check cv pointer when needed

Browse Source 
As 'cv' was already dereferenced, check for NULL with do {} while();
loop.
This commit is contained in:
Zdenek Kabelac 2024-06-13 23:06:09 +02:00
parent a98beb8ee3
commit 64ccbc4b52
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/format_text/flags.c
View File

@ -192,7 +192,7 @@ int read_flags(uint64_t *status, enum pv_vg_lv_e type, int mask, const struct dm
if (cv->type == DM_CFG_EMPTY_ARRAY) if (cv->type == DM_CFG_EMPTY_ARRAY)
goto out; goto out;
while (cv) { do {
if (cv->type != DM_CFG_STRING) { if (cv->type != DM_CFG_STRING) {
log_error("Status value is not a string."); log_error("Status value is not a string.");
return 0; return 0;
@ -228,8 +228,7 @@ int read_flags(uint64_t *status, enum pv_vg_lv_e type, int mask, const struct dm
return 0; return 0;
} }
cv = cv->next; } while ((cv = cv->next));
}
out: out:
*status |= s; *status |= s;

5
lib/format_text/import_vsn1.c
View File

@ -159,7 +159,7 @@ static int _read_str_list(struct dm_pool *mem, struct dm_list *list, const struc
if (cv->type == DM_CFG_EMPTY_ARRAY) if (cv->type == DM_CFG_EMPTY_ARRAY)
return 1; return 1;
while (cv) { do {
if (cv->type != DM_CFG_STRING) { if (cv->type != DM_CFG_STRING) {
log_error("Found an item that is not a string"); log_error("Found an item that is not a string");
return 0; return 0;
@ -168,8 +168,7 @@ static int _read_str_list(struct dm_pool *mem, struct dm_list *list, const struc
if (!str_list_add(mem, list, dm_pool_strdup(mem, cv->v.str))) if (!str_list_add(mem, list, dm_pool_strdup(mem, cv->v.str)))
return_0; return_0;
cv = cv->next; } while ((cv = cv->next));
}
return 1; return 1;
} }