Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1232670: Prepare Bluetooth PDU for sending after checking connection status, r=shuang

Browse Source 
The PDU contains a pointer to the operation's result handler. If sending
fails, the result handler is supposed to handle an error. But the PDU
will go out of scope first and release the handler. The error delivery
then fails with a segmentation fault.
This commit is contained in:
Thomas Zimmermann 2015-12-16 13:27:47 +01:00
parent c7cfbb88ac
commit 989aaf55fc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp
View File

@ -145,15 +145,15 @@ BluetoothDaemonProtocol::Send(DaemonSocketPDU* aPDU,
MOZ_ASSERT(mConnection); MOZ_ASSERT(mConnection);
MOZ_ASSERT(aPDU); MOZ_ASSERT(aPDU);
aPDU->SetConsumer(this);
aPDU->SetResultHandler(aRes);
aPDU->UpdateHeader();
if (mConnection->GetConnectionStatus() == SOCKET_DISCONNECTED) { if (mConnection->GetConnectionStatus() == SOCKET_DISCONNECTED) {
BT_LOGR("Connection to Bluetooth daemon is closed."); BT_LOGR("Connection to Bluetooth daemon is closed.");
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
aPDU->SetConsumer(this);
aPDU->SetResultHandler(aRes);
aPDU->UpdateHeader();
mConnection->SendSocketData(aPDU); // Forward PDU to command channel mConnection->SendSocketData(aPDU); // Forward PDU to command channel
return NS_OK; return NS_OK;