[Pkg-owncloud-commits] [owncloud-client] 10/70: Fix a possible crash caused by a dangling pointer

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 4a5ef8f1730c19ffbfad116f2ef213039e2bb48b
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Jun 12 10:29:17 2014 +0200

    Fix a possible crash caused by a dangling pointer
---
 src/wizard/owncloudshibbolethcredspage.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/wizard/owncloudshibbolethcredspage.cpp b/src/wizard/owncloudshibbolethcredspage.cpp
index 42b84ea..076d741 100644
--- a/src/wizard/owncloudshibbolethcredspage.cpp
+++ b/src/wizard/owncloudshibbolethcredspage.cpp
@@ -42,10 +42,9 @@ void OwncloudShibbolethCredsPage::setupBrowser()
     // we need to reset the cookie jar to drop temporary cookies (like the shib cookie)
     // i.e. if someone presses "back"
     QNetworkAccessManager *qnam = account->networkAccessManager();
-    delete qnam->cookieJar();
     CookieJar *jar = new CookieJar;
+    // Implicitly deletes the old cookie jar, and reparents the jar
     qnam->setCookieJar(jar);
-    jar->setParent(0);
 
     _browser = new ShibbolethWebView(account);
     connect(_browser, SIGNAL(shibbolethCookieReceived(const QNetworkCookie&, Account*)),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git