Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 18:32:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 738022 - gonk gps - test GpsInterface size before using. r=jdm

Browse Source
This commit is contained in:
Doug Turner 2012-03-21 22:25:59 -07:00
parent 79f6403b7a
commit 48e2d52190
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dom/system/gonk/GonkGPSGeolocationProvider.cpp
View File

@ -103,8 +103,8 @@ static GpsCallbacks gCallbacks = {
GonkGPSGeolocationProvider::GonkGPSGeolocationProvider()
: mStarted(false)
, mGpsInterface(nsnull)
{
mGpsInterface = GetGPSInterface();
}
GonkGPSGeolocationProvider::~GonkGPSGeolocationProvider()
@ -143,7 +143,12 @@ GonkGPSGeolocationProvider::GetGPSInterface()
return NULL;
gps_device_t* gps_device = (gps_device_t *)device;
return gps_device->get_gps_interface(gps_device);
const GpsInterface* result = gps_device->get_gps_interface(gps_device);
if (result->size != sizeof(GpsInterface)) {
return nsnull;
}
return result;
}
NS_IMETHODIMP
@ -152,15 +157,21 @@ GonkGPSGeolocationProvider::Startup()
if (mStarted)
return NS_OK;
mGpsInterface = GetGPSInterface();
NS_ENSURE_TRUE(mGpsInterface, NS_ERROR_FAILURE);
PRInt32 update = Preferences::GetInt("geo.default.update", 1000);
mGpsInterface->init(&gCallbacks);
if (mGpsInterface->init(&gCallbacks) != 0)
return NS_ERROR_FAILURE;
mGpsInterface->start();
mGpsInterface->set_position_mode(GPS_POSITION_MODE_STANDALONE,
GPS_POSITION_RECURRENCE_PERIODIC,
update, 0, 0);
mStarted = true;
return NS_OK;
}
@ -168,7 +179,6 @@ NS_IMETHODIMP
GonkGPSGeolocationProvider::Watch(nsIGeolocationUpdate* aCallback)
{
mLocationCallback = aCallback;
return NS_OK;
}
@ -178,9 +188,10 @@ GonkGPSGeolocationProvider::Shutdown()
if (!mStarted)
return NS_OK;
NS_ENSURE_TRUE(mGpsInterface, NS_OK);
mGpsInterface->stop();
mGpsInterface->cleanup();
return NS_OK;
}