[flashrom] [PATCH] Fix dediprog crash if usb_open() fails

Stefan Tauner stefan.tauner at student.tuwien.ac.at
Tue Jul 30 11:37:50 CEST 2013


On Mon, 29 Jul 2013 14:40:14 +0100
David Woodhouse <dwmw2 at infradead.org> wrote:

> Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
> 
> ---
> Ick. You made me touch Subversion, even if only through 'git svn clone'.

Just to remind you how good we have it today ;)

> diff --git a/dediprog.c b/dediprog.c
> index fb95d10..2640808 100644
> --- a/dediprog.c
> +++ b/dediprog.c
> @@ -884,6 +884,10 @@ int dediprog_init(void)
>  	msg_pdbg("Found USB device (%04x:%04x).\n",
>  		 dev->descriptor.idVendor, dev->descriptor.idProduct);
>  	dediprog_handle = usb_open(dev);
> +	if (!dediprog_handle) {
> +		msg_perr("Could not open USB device: %s\n", usb_strerror());
> +		return 1;
> +	}
>  	ret = usb_set_configuration(dediprog_handle, 1);
>  	if (ret < 0) {
>  		msg_perr("Could not set USB device configuration: %i %s\n",
> 

Excellent, thank you!
Acked-by: Stefan Tauner <stefan.tauner at student.tuwien.ac.at>
and committed in r1705.

-- 
Kind regards/Mit freundlichen Grüßen, Stefan Tauner




More information about the flashrom mailing list