From: Neil Brown Date: Thu, 15 May 2008 06:48:57 +0000 (+1000) Subject: Fix some initialisations... X-Git-Tag: devel~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2349791da2f2cd33ac84ce2b6d70914a1eed729;p=thirdparty%2Fmdadm.git Fix some initialisations... --- diff --git a/super-ddf.c b/super-ddf.c index 10647f32..91c53dae 100644 --- a/super-ddf.c +++ b/super-ddf.c @@ -597,6 +597,8 @@ static int load_ddf_global(int fd, struct ddf_super *super, char *devname) !super->virt) { free(super->phys); free(super->virt); + super->phys = NULL; + super->virt = NULL; return 2; } super->conflist = NULL; @@ -727,6 +729,7 @@ static int load_super_ddf(struct supertype *st, int fd, sizeof(*super)); return 1; } + memset(super, 0, sizeof(*super)); rv = load_ddf_headers(fd, super, devname); if (rv) { @@ -2251,6 +2254,7 @@ static int load_super_ddf_all(struct supertype *st, int fd, super = malloc(sizeof(*super)); if (!super) return 1; + memset(super, 0, sizeof(*super)); /* first, try each device, and choose the best ddf */ for (sd = sra->devs ; sd ; sd = sd->next) {