| Message ID | 1470391439-28427-1-git-send-email-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/05/2016 12:03 PM, Peter Maydell wrote: > get_image_size() doesn't handle being passed a NULL pointer, so > avoid doing that. Spotted by the clang ub sanitizer (which notices > the attempt to pass NULL to open()). > Looks good. Thanks Peter! > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/sparc/leon3.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c > index dbae41f..6e16478 100644 > --- a/hw/sparc/leon3.c > +++ b/hw/sparc/leon3.c > @@ -171,7 +171,11 @@ static void leon3_generic_hw_init(MachineState *machine) > } > filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); > > - bios_size = get_image_size(filename); > + if (filename) { > + bios_size = get_image_size(filename); > + } else { > + bios_size = -1; > + } > > if (bios_size > prom_size) { > fprintf(stderr, "qemu: could not load prom '%s': file too big\n", >
On 5 August 2016 at 13:59, Fabien Chouteau <chouteau@adacore.com> wrote: > On 08/05/2016 12:03 PM, Peter Maydell wrote: >> get_image_size() doesn't handle being passed a NULL pointer, so >> avoid doing that. Spotted by the clang ub sanitizer (which notices >> the attempt to pass NULL to open()). >> > > Looks good. Thanks; I've applied this patch to master. -- PMM
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index dbae41f..6e16478 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -171,7 +171,11 @@ static void leon3_generic_hw_init(MachineState *machine) } filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - bios_size = get_image_size(filename); + if (filename) { + bios_size = get_image_size(filename); + } else { + bios_size = -1; + } if (bios_size > prom_size) { fprintf(stderr, "qemu: could not load prom '%s': file too big\n",
get_image_size() doesn't handle being passed a NULL pointer, so avoid doing that. Spotted by the clang ub sanitizer (which notices the attempt to pass NULL to open()). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/sparc/leon3.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)