Changeset 215928 in webkit

Timestamp:

Apr 28, 2017 10:16:47 AM (7 years ago)

Author:

achristensen@apple.com

Message:

Fix memory corruption issue after r215883.
​https://bugs.webkit.org/show_bug.cgi?id=171365

Reviewed by Brady Eidson.

This fixes a crash when starting WebKit2.

• platform/network/cf/NetworkStorageSessionCFNet.cpp:

(WebCore::NetworkStorageSession::NetworkStorageSession):
Initialize m_platformCookieStorage with the default constructor of RetainPtr,
then call NetworkStorageSession::cookieStorage which checks m_platformCookieStorage
for null. It was checking uninitialized memory when we had m_platformCookieStorage
in the initializer list.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/NetworkStorageSessionCFNet.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-28  Alex Christensen  <achristensen@webkit.org>
+
+        Fix memory corruption issue after r215883.
+        https://bugs.webkit.org/show_bug.cgi?id=171365
+
+        Reviewed by Brady Eidson.
+
+        This fixes a crash when starting WebKit2.
+
+        * platform/network/cf/NetworkStorageSessionCFNet.cpp:
+        (WebCore::NetworkStorageSession::NetworkStorageSession):
+        Initialize m_platformCookieStorage with the default constructor of RetainPtr,
+        then call NetworkStorageSession::cookieStorage which checks m_platformCookieStorage
+        for null.  It was checking uninitialized memory when we had m_platformCookieStorage
+        in the initializer list.
+
 2017-04-28  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp

@@ -73 +73 @@
     : m_sessionID(sessionID)
     , m_platformSession(WTFMove(platformSession))
-    , m_platformCookieStorage(platformCookieStorage ? WTFMove(platformCookieStorage) : cookieStorage())
-{
+{
+    m_platformCookieStorage = platformCookieStorage ? WTFMove(platformCookieStorage) : cookieStorage();
 }