Remove SEH block from around history plist read, since the underlying bug...
authorsfalken <sfalken@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Jun 2007 21:28:40 +0000 (21:28 +0000)
committersfalken <sfalken@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Jun 2007 21:28:40 +0000 (21:28 +0000)
        Reviewed by Darin.

        * WebHistory.cpp:
        (createHistoryListFromStream):

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

WebKit/win/ChangeLog
WebKit/win/WebHistory.cpp

index b15af2b..46e2cee 100644 (file)
@@ -1,3 +1,12 @@
+2007-06-27  Steve Falkenburg  <sfaken@apple.com>
+
+        Remove SEH block from around history plist read, since the underlying bug has been fixed.
+        
+        Reviewed by Darin.
+
+        * WebHistory.cpp:
+        (createHistoryListFromStream):
+
 2007-06-27  Steve Falkenburg  <sfalken@apple.com>
 
         Prefast: Fix misplaced parenthesis.
index 4b5a44a..42ec6ea 100644 (file)
@@ -250,16 +250,9 @@ exit:
     return hr;
 }
 
-CFDictionaryRef createHistoryListFromStream(CFReadStreamRef stream, CFPropertyListFormat format)
+static CFDictionaryRef createHistoryListFromStream(CFReadStreamRef stream, CFPropertyListFormat format)
 {
-    __try // FIXME- <rdar://4754295> Prevent crash when reading corrupt plists for the seed.  Real fix is to figure out why CF$UID plist entries get written out by CF occasionally.
-    {
-        return (CFDictionaryRef)CFPropertyListCreateFromStream(0, stream, 0, kCFPropertyListImmutable, &format, 0);
-    }
-    __except(1) // FIXME- <rdar://4754295> Prevent crash when reading corrupt plists for the seed.  Real fix is to figure out why CF$UID plist entries get written out by CF occasionally.
-    {
-        return 0;
-    }
+    return (CFDictionaryRef)CFPropertyListCreateFromStream(0, stream, 0, kCFPropertyListImmutable, &format, 0);
 }
 
 HRESULT WebHistory::loadHistoryGutsFromURL(CFURLRef url, CFMutableArrayRef discardedItems, IWebError** /*error*/) //FIXME