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

* grub-core/commands/probe.c: Add missing grub_device_close.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-28 13:54:32 +02:00
parent 9f73ebd49b
commit eadfad244e
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-04-28 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/probe.c: Add missing grub_device_close.
2013-04-28 Vladimir Serbinenko <phcoder@gmail.com> 2013-04-28 Vladimir Serbinenko <phcoder@gmail.com>
* INSTALL: Document linguas.sh. * INSTALL: Document linguas.sh.

6
grub-core/commands/probe.c
View file

@ -83,6 +83,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
grub_env_set (state[0].arg, val); grub_env_set (state[0].arg, val);
else else
grub_printf ("%s", val); grub_printf ("%s", val);
grub_device_close (dev);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
if (state[2].set) if (state[2].set)
@ -94,6 +95,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
grub_env_set (state[0].arg, val); grub_env_set (state[0].arg, val);
else else
grub_printf ("%s", val); grub_printf ("%s", val);
grub_device_close (dev);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
fs = grub_fs_probe (dev); fs = grub_fs_probe (dev);
@ -105,6 +107,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
grub_env_set (state[0].arg, fs->name); grub_env_set (state[0].arg, fs->name);
else else
grub_printf ("%s", fs->name); grub_printf ("%s", fs->name);
grub_device_close (dev);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
if (state[4].set) if (state[4].set)
@ -125,6 +128,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
else else
grub_printf ("%s", uuid); grub_printf ("%s", uuid);
grub_free (uuid); grub_free (uuid);
grub_device_close (dev);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
if (state[5].set) if (state[5].set)
@ -147,8 +151,10 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
else else
grub_printf ("%s", label); grub_printf ("%s", label);
grub_free (label); grub_free (label);
grub_device_close (dev);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
grub_device_close (dev);
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unrecognised target"); return grub_error (GRUB_ERR_BAD_ARGUMENT, "unrecognised target");
} }