diff options
-rw-r--r-- | Incremental.c | 2 | ||||
-rw-r--r-- | policy.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Incremental.c b/Incremental.c index 951c2a07..09cdd9b4 100644 --- a/Incremental.c +++ b/Incremental.c @@ -1464,7 +1464,7 @@ static int Incremental_container(struct supertype *st, char *devname, fprintf(stderr, Name ": failed to get exclusive lock on " "mapfile\n"); /* do not assemble arrays that might have bad blocks */ - if (list->array.state & (1<<MD_SB_BBM_ERRORS)) { + if (list && list->array.state & (1<<MD_SB_BBM_ERRORS)) { fprintf(stderr, Name ": BBM log found in metadata. " "Cannot activate array(s).\n"); /* free container data and exit */ @@ -678,6 +678,8 @@ struct domainlist *domain_from_array(struct mdinfo *mdi, const char *metadata) { struct domainlist *domlist = NULL; + if (!mdi) + return NULL; for (mdi = mdi->devs ; mdi ; mdi = mdi->next) domainlist_add_dev(&domlist, makedev(mdi->disk.major, mdi->disk.minor), |