From 1594b70bc1889d53fc353376220da59ae59bfe03 Mon Sep 17 00:00:00 2001 From: Ryan Leavengood Date: Fri, 12 Sep 2008 04:44:55 +0000 Subject: [PATCH] Fixed CID 1301: we should probably have the null check of defaultPipe before it is first dereferenced... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27430 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/usb/BusManager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/add-ons/kernel/bus_managers/usb/BusManager.cpp b/src/add-ons/kernel/bus_managers/usb/BusManager.cpp index f52a08906e..546ca6c889 100644 --- a/src/add-ons/kernel/bus_managers/usb/BusManager.cpp +++ b/src/add-ons/kernel/bus_managers/usb/BusManager.cpp @@ -124,7 +124,6 @@ BusManager::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort, TRACE(("USB BusManager: setting device address to %d\n", deviceAddress)); ControlPipe *defaultPipe = _GetDefaultPipe(speed); - defaultPipe->SetHubInfo(hubAddress, hubPort); if (!defaultPipe) { TRACE_ERROR(("USB BusManager: error getting the default pipe for speed %d\n", (int)speed)); @@ -132,6 +131,8 @@ BusManager::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort, return NULL; } + defaultPipe->SetHubInfo(hubAddress, hubPort); + status_t result = B_ERROR; for (int32 i = 0; i < 3; i++) { // Set the address of the device USB 1.1 spec p202