cov: add explicit check for 0 size

(cherry picked from commit ae407d2f3cb1d607463d6d5964e44f11857cdb1f)

diff --git a/device_mapper/libdm-report.c b/device_mapper/libdm-report.c
index b2dc1b70c0060c1664e53e8d5970d829d1d488d0..1521708ed2e9f02547ce9bf69b7c5cf75ea362e1 100644 (file)
--- a/device_mapper/libdm-report.c
+++ b/device_mapper/libdm-report.c
@@ -3832,7 +3832,9 @@ static struct field_selection *_create_field_selection(struct dm_report *rh,
                                        goto bad;
                                fs->value->v.l = *((struct selection_str_list **) custom);
 
-                               s_arr_size = dm_list_size(&fs->value->v.l->str_list.list);
+                               if (!(s_arr_size = dm_list_size(&fs->value->v.l->str_list.list)))
+                                       break;
+
                                if (!(s_arr = malloc(sizeof(char *) * s_arr_size))) {
                                        log_error("dm_report: malloc failed for regex array "
                                                  "for selection field %s", field_id);

diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c
index 18f7b6eb80c261da994e5dac9f6c678a7755b6d4..b8686901f75cb6b42d0568e76c1fb7442233c8fb 100644 (file)
--- a/libdm/libdm-report.c
+++ b/libdm/libdm-report.c
@@ -3829,7 +3829,9 @@ static struct field_selection *_create_field_selection(struct dm_report *rh,
                                        goto bad;
                                fs->value->v.l = *((struct selection_str_list **) custom);
 
-                               s_arr_size = dm_list_size(&fs->value->v.l->str_list.list);
+                               if (!(s_arr_size = dm_list_size(&fs->value->v.l->str_list.list)))
+                                       break;
+
                                if (!(s_arr = malloc(sizeof(char *) * s_arr_size))) {
                                        log_error("dm_report: malloc failed for regex array "
                                                  "for selection field %s", field_id);