Fix uncaught exception crash when socket ready read signal throws

When the application (in this case, an autotest) ran out of memory by
calling readAll() in a slot, the exception propagated to the symbian
active scheduler where it caused an assertion failure.
Additionally, QAbstractSocket was left in a bad state because its
member variables that guard against re-entrancy were left set.

1. Catch exceptions and convert to leaves in QAsyncSelect
2. Implement RunError function to set the socket engine error state
3. Use QScopedValueRollback in QAbstractSocket to ensure the reentrancy
   guards are reverted if an exception is thrown.

Reviewed-by: Markus Goetz
Reviewed-by: mread

1 files changed, 3 insertions, 0 deletions

diff --git a/src/network/socket/qsymbiansocketengine_p.h b/src/network/socket/qsymbiansocketengine_p.h
index bc85f9c..f36b7dd 100644
--- a/src/network/socket/qsymbiansocketengine_p.h
+++ b/src/network/socket/qsymbiansocketengine_p.h
@@ -72,6 +72,7 @@ class QNetworkInterface;
 class Q_AUTOTEST_EXPORT QSymbianSocketEngine : public QAbstractSocketEngine
 {
     Q_OBJECT
+    friend class QAsyncSelect;
 public:
     QSymbianSocketEngine(QObject *parent = 0);
     ~QSymbianSocketEngine();
@@ -167,6 +168,8 @@ public:
 protected:
     void DoCancel();
     void RunL();
+    void run();
+    TInt RunError(TInt aError);
 
 private:
     QReadNotifier* iReadN;