From: mitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun, 15 Jan 2012 00:31:23 +0000 (+0000)
Subject: <rdar://problem/10696295> Crash in WebProcess at com.apple.CFNetwork: URLCredentialSt... 
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=04da4bb9383ad721dd4496338b3bfe1a0ca413ae;hp=c5026b1c102041dc7e932da00ab1b637625287ab

<rdar://problem/10696295> Crash in WebProcess at com.apple.CFNetwork: URLCredentialStorage::CreateCurrentPersistentCredentials + 298

Reviewed by Anders Carlsson.

* WebProcess/mac/SecItemShimMethods.mm:
(WebKit::initializeSecItemShim): Removed an early return that was accidentally added in r105008.



git-svn-id: https://svn.webkit.org/repository/webkit/trunk@105026 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 7ed940ddd39f..7de491cbfb8f 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-14  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10696295> Crash in WebProcess at com.apple.CFNetwork: URLCredentialStorage::CreateCurrentPersistentCredentials + 298
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/mac/SecItemShimMethods.mm:
+        (WebKit::initializeSecItemShim): Removed an early return that was accidentally added in r105008.
+
 2012-01-13  Anders Carlsson  <andersca@apple.com>
 
         Delay updating the root compositing layer if the layer tree state is frozen
diff --git a/Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm b/Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm
index 7b783a3ad349..c3575744f86a 100644
--- a/Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm
+++ b/Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm
@@ -105,7 +105,6 @@ static OSStatus webSecItemDelete(CFDictionaryRef query)
 
 void initializeSecItemShim()
 {
-    return;
     const WebProcessSecItemShimCallbacks callbacks = {
         webSecItemCopyMatching,
         webSecItemAdd,