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

Bug 505724 nsWifiMonitor::DoScan seems to leak apple_80211_library or crash in all failure cases

Browse Source 
r=dougt
This commit is contained in:
timeless 2009-08-12 11:49:53 +02:00
parent e5afce9f26
commit aadba2112a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netwerk/wifi/src/nsWifiScannerMac.cpp
View File

@ -59,6 +59,8 @@ nsWifiMonitor::DoScan()
void *apple_80211_library = dlopen(
"/System/Library/PrivateFrameworks/Apple80211.framework/Apple80211",
RTLD_LAZY);
if (!apple_80211_library)
return NS_ERROR_NOT_AVAILABLE;
WirelessContextPtr wifi_context_;
@ -66,11 +68,15 @@ nsWifiMonitor::DoScan()
WirelessScanSplitFunction WirelessScanSplit_function_ = reinterpret_cast<WirelessScanSplitFunction>(dlsym(apple_80211_library, "WirelessScanSplit"));
WirelessDetachFunction WirelessDetach_function_ = reinterpret_cast<WirelessDetachFunction>(dlsym(apple_80211_library, "WirelessDetach"));
if (!WirelessAttach_function_ || !WirelessScanSplit_function_ || !WirelessDetach_function_)
if (!WirelessAttach_function_ || !WirelessScanSplit_function_ || !WirelessDetach_function_) {
dlclose(apple_80211_library);
return NS_ERROR_NOT_AVAILABLE;
}
if ((*WirelessAttach_function_)(&wifi_context_, 0) != noErr)
if ((*WirelessAttach_function_)(&wifi_context_, 0) != noErr) {
dlclose(apple_80211_library);
return NS_ERROR_FAILURE;
}
// Regularly get the access point data.
@ -136,9 +142,11 @@ nsWifiMonitor::DoScan()
{
PRUint32 resultCount = lastAccessPoints.Count();
nsIWifiAccessPoint** result = static_cast<nsIWifiAccessPoint**> (nsMemory::Alloc(sizeof(nsIWifiAccessPoint*) * resultCount));
if (!result)
if (!result) {
dlclose(apple_80211_library);
return NS_ERROR_OUT_OF_MEMORY;
}
for (PRUint32 i = 0; i < resultCount; i++)
result[i] = lastAccessPoints[i];