vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

plan9: Add missing grub_device_close.

Browse source 
Found by: Coverity scan.
This commit is contained in:
Vladimir Serbinenko 2015-01-26 09:44:33 +01:00
parent ef02b4ca93
commit e12c3bed90
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
grub-core/loader/i386/pc/plan9.c
View file

@ -342,6 +342,7 @@ fill_disk (const char *name, void *data)
if (!plan9name) if (!plan9name)
{ {
grub_print_error (); grub_print_error ();
grub_device_close (dev);
return 0; return 0;
} }
if (grub_extend_alloc (fill_ctx->pmapptr + grub_strlen (plan9name) if (grub_extend_alloc (fill_ctx->pmapptr + grub_strlen (plan9name)
@ -349,6 +350,7 @@ fill_disk (const char *name, void *data)
&fill_ctx->pmap)) &fill_ctx->pmap))
{ {
grub_free (plan9name); grub_free (plan9name);
grub_device_close (dev);
return 1; return 1;
} }
grub_strcpy (fill_ctx->pmap + fill_ctx->pmapptr, plan9name); grub_strcpy (fill_ctx->pmap + fill_ctx->pmapptr, plan9name);
@ -366,12 +368,19 @@ fill_disk (const char *name, void *data)
fill_ctx->noslash = 1; fill_ctx->noslash = 1;
grub_memset (fill_ctx->prefixescnt, 0, sizeof (fill_ctx->prefixescnt)); grub_memset (fill_ctx->prefixescnt, 0, sizeof (fill_ctx->prefixescnt));
if (grub_partition_iterate (dev->disk, fill_partition, fill_ctx)) if (grub_partition_iterate (dev->disk, fill_partition, fill_ctx))
return 1; {
grub_device_close (dev);
return 1;
}
if (grub_extend_alloc (fill_ctx->pmapptr + 1, &fill_ctx->pmapalloc, if (grub_extend_alloc (fill_ctx->pmapptr + 1, &fill_ctx->pmapalloc,
&fill_ctx->pmap)) &fill_ctx->pmap))
return 1; {
grub_device_close (dev);
return 1;
}
fill_ctx->pmap[fill_ctx->pmapptr++] = '\n'; fill_ctx->pmap[fill_ctx->pmapptr++] = '\n';
grub_device_close (dev);
return 0; return 0;
} }