From owner-svn-src-all@FreeBSD.ORG Fri Oct 23 03:51:33 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21B86106566B; Fri, 23 Oct 2009 03:51:33 +0000 (UTC) (envelope-from jhay@meraka.csir.co.za) Received: from zibbi.meraka.csir.co.za (zibbi.meraka.csir.co.za [IPv6:2001:4200:7000:2::1]) by mx1.freebsd.org (Postfix) with ESMTP id 430D18FC0A; Fri, 23 Oct 2009 03:51:32 +0000 (UTC) Received: by zibbi.meraka.csir.co.za (Postfix, from userid 3973) id 489B03982D; Fri, 23 Oct 2009 05:51:27 +0200 (SAST) Date: Fri, 23 Oct 2009 05:51:27 +0200 From: John Hay To: Andrew Thompson Message-ID: <20091023035127.GA23683@zibbi.meraka.csir.co.za> References: <200910222101.n9ML1fT9040071@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200910222101.n9ML1fT9040071@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r198376 - head/lib/libusb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2009 03:51:33 -0000 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@meraka.csir.co.za / jhay@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; >