PERFORCE change 170795 for review

[Hans Petter Selasky]

http://p4web.freebsd.org/chv.cgi?CH=170795

Change 170795 by hselasky at hselasky_laptop001 on 2009/11/19 08:06:13

	
	LibUSB v1.0:
		- fix a transfer cancelling bug/segfault
		- reported by: Robert Jenssen

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb10.c#17 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb10.c#17 (text+ko) ====

@@ -1115,6 +1115,8 @@
 		return;
 	case 2:
 		sxfer = libusb20_tr_get_priv_sc1(pxfer1);
+		if (sxfer == NULL)
+			return;		/* cancelling */
 		if (sxfer->rem_len)
 			return;		/* cannot queue another one */
 		/* swap transfers */
@@ -1122,6 +1124,8 @@
 		break;
 	case 1:
 		sxfer = libusb20_tr_get_priv_sc1(pxfer0);
+		if (sxfer == NULL)
+			return;		/* cancelling */
 		if (sxfer->rem_len)
 			return;		/* cannot queue another one */
 		/* swap transfers */