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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 21af07d5db96fedf6077d7dc432c348c3596564e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 7 00:16:36 2002 +0000

    	- fixed bug that affected BinHex-encoded files with no resource fork
    
            * Downloads.subproj/WebBinHexDecoder.m:
            (-[WebBinHexDecoder decodeData:dataForkData:resourceForkData:]):
    	Don't decode the resource fork unless done with the data fork.
    
            * Downloads.subproj/WebDownloadHandler.m: (-[WebDownloadHandler receivedData:]):
    	Set the forks to nil before calling through.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9301c25..67ab37b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2002-11-06  Darin Adler  <darin at apple.com>
 
+	- fixed bug that affected BinHex-encoded files with no resource fork
+
+        * Downloads.subproj/WebBinHexDecoder.m:
+        (-[WebBinHexDecoder decodeData:dataForkData:resourceForkData:]):
+	Don't decode the resource fork unless done with the data fork.
+
+        * Downloads.subproj/WebDownloadHandler.m: (-[WebDownloadHandler receivedData:]):
+	Set the forks to nil before calling through.
+
+2002-11-06  Darin Adler  <darin at apple.com>
+
         * Downloads.subproj/WebMacBinaryDecoder.m: (+[WebMacBinaryDecoder canDecodeHeaderData:]):
 	Fix == 129 check that was supposed to be <= 129.
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9301c25..67ab37b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-11-06  Darin Adler  <darin at apple.com>
 
+	- fixed bug that affected BinHex-encoded files with no resource fork
+
+        * Downloads.subproj/WebBinHexDecoder.m:
+        (-[WebBinHexDecoder decodeData:dataForkData:resourceForkData:]):
+	Don't decode the resource fork unless done with the data fork.
+
+        * Downloads.subproj/WebDownloadHandler.m: (-[WebDownloadHandler receivedData:]):
+	Set the forks to nil before calling through.
+
+2002-11-06  Darin Adler  <darin at apple.com>
+
         * Downloads.subproj/WebMacBinaryDecoder.m: (+[WebMacBinaryDecoder canDecodeHeaderData:]):
 	Fix == 129 check that was supposed to be <= 129.
 
diff --git a/WebKit/Downloads.subproj/WebBinHexDecoder.m b/WebKit/Downloads.subproj/WebBinHexDecoder.m
index fd02cc2..6be3d5c 100644
--- a/WebKit/Downloads.subproj/WebBinHexDecoder.m
+++ b/WebKit/Downloads.subproj/WebBinHexDecoder.m
@@ -327,6 +327,9 @@ done:
 
 - (BOOL)decodeData:(NSData *)data dataForkData:(NSData **)dataForkData resourceForkData:(NSData **)resourceForkData
 {
+    *dataForkData = nil;
+    *resourceForkData = nil;
+    
     [self setUpSourceForData:data];
     
     if (_name[0] == 0) {
@@ -335,7 +338,9 @@ done:
     ASSERT(_sawError || _name[0]);
     
     [self decodeForkWithData:dataForkData count:&_dataForkLengthRemaining CRCCheckFlag:&_dataForkCRCChecked];
-    [self decodeForkWithData:resourceForkData count:&_resourceForkLengthRemaining CRCCheckFlag:&_resourceForkCRCChecked];
+    if (_dataForkCRCChecked) {
+        [self decodeForkWithData:resourceForkData count:&_resourceForkLengthRemaining CRCCheckFlag:&_resourceForkCRCChecked];
+    }
 
     return !_sawError;
 }
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index 1626009..6117e45 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -287,7 +287,8 @@
         return nil;
     }	
     
-    NSData *dataForkData, *resourceForkData;
+    NSData *dataForkData = nil;
+    NSData *resourceForkData = nil;
     
     if (![self decodeData:data dataForkData:&dataForkData resourceForkData:&resourceForkData]) {
         ERROR("Download decoding failed.");
diff --git a/WebKit/Downloads.subproj/WebDownloadHandler.m b/WebKit/Downloads.subproj/WebDownloadHandler.m
index 1626009..6117e45 100644
--- a/WebKit/Downloads.subproj/WebDownloadHandler.m
+++ b/WebKit/Downloads.subproj/WebDownloadHandler.m
@@ -287,7 +287,8 @@
         return nil;
     }	
     
-    NSData *dataForkData, *resourceForkData;
+    NSData *dataForkData = nil;
+    NSData *resourceForkData = nil;
     
     if (![self decodeData:data dataForkData:&dataForkData resourceForkData:&resourceForkData]) {
         ERROR("Download decoding failed.");

-- 
WebKit Debian packaging