svn commit: r198376 - head/lib/libusb

[John Hay]

Hi,

Any chance that we can get it into 8.0 too? This fix printing with
print/hplip3, which is probably what most people with multi-function
HP printers will use.

John
-- 
John Hay -- jhay at meraka.csir.co.za / jhay at FreeBSD.org

On Thu, Oct 22, 2009 at 09:01:41PM +0000, Andrew Thompson wrote:
> Author: thompsa
> Date: Thu Oct 22 21:01:41 2009
> New Revision: 198376
> URL: http://svn.freebsd.org/changeset/base/198376
> 
> Log:
>   Prevent wraparound of the timeout variable.
>   
>   Submitted by:	HPS
> 
> Modified:
>   head/lib/libusb/libusb20_ugen20.c
> 
> Modified: head/lib/libusb/libusb20_ugen20.c
> ==============================================================================
> --- head/lib/libusb/libusb20_ugen20.c	Thu Oct 22 20:59:51 2009	(r198375)
> +++ head/lib/libusb/libusb20_ugen20.c	Thu Oct 22 21:01:41 2009	(r198376)
> @@ -800,7 +800,11 @@ ugen20_tr_submit(struct libusb20_transfe
>  	if (xfer->flags & LIBUSB20_TRANSFER_DO_CLEAR_STALL) {
>  		fsep->flags |= USB_FS_FLAG_CLEAR_STALL;
>  	}
> -	fsep->timeout = xfer->timeout;
> +	/* NOTE: The "fsep->timeout" variable is 16-bit. */
> +	if (xfer->timeout > 65535)
> +		fsep->timeout = 65535;
> +	else
> +		fsep->timeout = xfer->timeout;
>  
>  	temp.ep_index = xfer->trIndex;
>