diff options
| author | Juha Kukkonen <ext-juha.kukkonen@nokia.com> | 2012-06-20 12:39:36 +0300 |
|---|---|---|
| committer | Juha Kukkonen <ext-juha.kukkonen@nokia.com> | 2012-06-20 14:13:07 +0300 |
| commit | 989c72bf3a9a5227d1172390d695ca5c9e98634c (patch) | |
| tree | 820d288b6d95c71aad5170a52dbd91e0bd1055f7 | |
| parent | 50b945e17c5bb92159fe7cb51bfadb094e4a5cd5 (diff) | |
Fix error handling in systeminfo on Symbian
Leaving functions were called in non-leaving functions, which could
lead to crash e.g. in application exit.
Trap handlers were added to relevant places.
Task-number: ou1cimx1#1008046
Reviewed-by: Aapo Haapanen
| -rw-r--r-- | src/systeminfo/qsysteminfo_s60_p.h | 4 | ||||
| -rw-r--r-- | src/systeminfo/symbian/wlaninfo_s60.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/systeminfo/qsysteminfo_s60_p.h b/src/systeminfo/qsysteminfo_s60_p.h index 38b5e20a98..1280541772 100644 --- a/src/systeminfo/qsysteminfo_s60_p.h +++ b/src/systeminfo/qsysteminfo_s60_p.h @@ -552,7 +552,7 @@ public: { if (!m_networkinfolistener) { - m_networkinfolistener = CNetworkOperatorNameListener::NewL(); + TRAP_IGNORE(m_networkinfolistener = CNetworkOperatorNameListener::NewL()); } return m_networkinfolistener; } @@ -592,7 +592,7 @@ public: #endif { TRACES(qDebug() << "DeviceInfo():Constructor"); - m_telephony = CTelephony::NewL(); + TRAP_IGNORE(m_telephony = CTelephony::NewL()); }; ~DeviceInfo() diff --git a/src/systeminfo/symbian/wlaninfo_s60.cpp b/src/systeminfo/symbian/wlaninfo_s60.cpp index 330d9b671f..2e662f32f2 100644 --- a/src/systeminfo/symbian/wlaninfo_s60.cpp +++ b/src/systeminfo/symbian/wlaninfo_s60.cpp @@ -63,7 +63,7 @@ CWlanInfo::CWlanInfo() : CActive(EPriorityStandard), #ifndef __WINSCW__ TRAP_IGNORE( m_wlanMgmtClient = CWlanMgmtClient::NewL();) if (m_wlanMgmtClient) { - m_wlanMgmtClient->ActivateNotificationsL(*this); + TRAP_IGNORE(m_wlanMgmtClient->ActivateNotificationsL(*this)); initWlanInfo(); StartMonitoring(); } |