1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash in connman bearer backend when accessing null objects

Browse Source 
Change-Id: Ib199b4093d86d1596b630223d0734171ba0d82c5
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
This commit is contained in:
Lorn Potter 2014-05-15 09:07:07 +10:00 committed by The Qt Project
parent 297be273a3
commit d86af6e4b6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/bearer/connman/qconnmanengine.cpp
View File

@ -186,7 +186,7 @@ void QConnmanEngine::connectToId(const QString &id)
QConnmanServiceInterface *serv = connmanServiceInterfaces.value(id); QConnmanServiceInterface *serv = connmanServiceInterfaces.value(id);
if (!serv->isValid()) { if (!serv || !serv->isValid()) {
emit connectionError(id, QBearerEngineImpl::InterfaceLookupError); emit connectionError(id, QBearerEngineImpl::InterfaceLookupError);
} else { } else {
if (serv->type() == QLatin1String("cellular")) { if (serv->type() == QLatin1String("cellular")) {
@ -211,7 +211,7 @@ void QConnmanEngine::disconnectFromId(const QString &id)
QMutexLocker locker(&mutex); QMutexLocker locker(&mutex);
QConnmanServiceInterface *serv = connmanServiceInterfaces.value(id); QConnmanServiceInterface *serv = connmanServiceInterfaces.value(id);
if (!serv->isValid()) { if (!serv || !serv->isValid()) {
emit connectionError(id, DisconnectionError); emit connectionError(id, DisconnectionError);
} else { } else {
serv->disconnect(); serv->disconnect();
@ -263,6 +263,8 @@ QNetworkSession::State QConnmanEngine::sessionStateForId(const QString &id)
QString service = id; QString service = id;
QConnmanServiceInterface *serv = connmanServiceInterfaces.value(service); QConnmanServiceInterface *serv = connmanServiceInterfaces.value(service);
if (!serv)
return QNetworkSession::Invalid;
QString servState = serv->state(); QString servState = serv->state();
@ -368,6 +370,8 @@ void QConnmanEngine::serviceStateChanged(const QString &state)
void QConnmanEngine::configurationChange(QConnmanServiceInterface *serv) void QConnmanEngine::configurationChange(QConnmanServiceInterface *serv)
{ {
if (!serv)
return;
QMutexLocker locker(&mutex); QMutexLocker locker(&mutex);
QString id = serv->path(); QString id = serv->path();
@ -409,8 +413,10 @@ QNetworkConfiguration::StateFlags QConnmanEngine::getStateForService(const QStri
{ {
QMutexLocker locker(&mutex); QMutexLocker locker(&mutex);
QConnmanServiceInterface *serv = connmanServiceInterfaces.value(service); QConnmanServiceInterface *serv = connmanServiceInterfaces.value(service);
QString state = serv->state(); if (!serv)
return QNetworkConfiguration::Undefined;
QString state = serv->state();
QNetworkConfiguration::StateFlags flag = QNetworkConfiguration::Defined; QNetworkConfiguration::StateFlags flag = QNetworkConfiguration::Defined;
if (serv->type() == QLatin1String("cellular")) { if (serv->type() == QLatin1String("cellular")) {