Changeset 28589 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 22, 2010 12:40:25 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

60431

Message:

FE/Qt: Fixing segfault in QIHttp class and this class-users.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIHttp.h (modified) (4 diffs)
• widgets/UIDownloader.cpp (modified) (2 diffs)
• widgets/UIDownloaderUserManual.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIHttp.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -119 +119 @@
     }
 
+    /* This method is doing effictevely the same as abort()
+     * but in its turn trying to do all after other things been done. */
+    void abortAll()
+    {
+        QTimer::singleShot(0, this, SLOT(abort()));
+    }
+
 signals:
 
@@ -125 +132 @@
 private slots:
 
+    /* We should hide this method from direct call as its very
+     * dangerous to call it while other requests are being processed.
+     * Use abortAll() to get the same result. */
+    void abort()
+    {
+        QHttp::abort();
+    }
+
     void timeouted()
     {
         mErrorCode = TimeoutError;
-        abort();
+        abortAll();
     }
 
@@ -138 +153 @@
             case 301:
                 mErrorCode = MovedPermanentlyError;
-                return abort();
+                return abortAll();
             case 302:
                 mErrorCode = MovedTemporarilyError;
-                return abort();
+                return abortAll();
             case 404:
                 mErrorCode = PageNotFoundError;
-                return abort();
+                return abortAll();
             default:
                 mErrorCode = (AdvancedError) QHttp::error();

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.cpp

@@ -167 +167 @@
 {
     /* Abort connection as we already got all we need */
-    m_pHttp->abort();
+    m_pHttp->abortAll();
 }
 
@@ -173 +173 @@
  * to download file of proposed size if no error present or
  * abort download progress if error is present */
-void UIDownloader::acknowledgeFinished(bool fError)
-{
-    NOREF(fError);
-
-    AssertMsg(fError, ("Error must be 'true' due to aborting.\n"));
-
+void UIDownloader::acknowledgeFinished(bool /* fError */)
+{
     m_pHttp->disconnect(this);
 
     switch (m_pHttp->errorCode())
     {
-        case QIHttp::Aborted:
+        case QIHttp::NoError: /* full packet comes before aborting */
+        case QIHttp::Aborted: /* part of packet comes before aborting */
         {
             /* Ask the user if he wish to download it */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloaderUserManual.cpp

@@ -112 +112 @@
     /* If current source was wrong but other is present
      * we will try other source else we should finish: */
-    if (fError && !m_sourcesList.isEmpty())
+    if (m_pHttp->errorCode() != QIHttp::Aborted && m_pHttp->errorCode() != QIHttp::NoError && !m_sourcesList.isEmpty())
         startDownload();
     else