[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 39c5b08997a0f4860db4cfff6cc947fea0ffa186
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 16 13:56:10 2002 +0000

    2002-07-16  Ken Kocienda  <kocienda at apple.com>
    
            Fix for this bug:
    
            Radar 2997750 (Sherlock crashes at launch - reproducible on my machine 100%)
    
            This is a bug that only occurs when a zer-length cache file is encountered.
            The NSUnarchiver init method does not handle this situation, and throws an exception.
            Hence, calls to NSUnarchiver must be done inside an NS_DURING. Note that this change
            merely expands the scope of the already-existing NS_DURING to include
            the NSUnarchiver init method.
    
            * Database.subproj/IFURLFileDatabase.m:
            (-[IFURLFileDatabase objectForKey:])
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1570 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 0449a6d..108fdee 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -600,11 +600,11 @@ static void databaseInit()
     // go to disk
     filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
     fileReader = [[IFURLFileReader alloc] initWithPath:filePath];
-    if (fileReader && (data = [fileReader data])) {
-        unarchiver = [[NSUnarchiver alloc] initForReadingWithData:data];
-    }
     
     NS_DURING
+        if (fileReader && (data = [fileReader data])) {
+            unarchiver = [[NSUnarchiver alloc] initForReadingWithData:data];
+        }
         if (unarchiver) {
             fileKey = [unarchiver decodeObject];
             object = [unarchiver decodeObject];

-- 
WebKit Debian packaging