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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 10eaeb8606453b8db8d5e72c7dbd187d63b123aa
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 13 22:36:31 2003 +0000

            Reviewed by Chris and Richard.
    
    	- fixed 3257296 -- REGRESSION: crash in WebImageRendererFactory (movietickets.com)
    
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageRenderer initWithMIMEType:]): Check for nil.
            (-[WebImageRenderer initWithData:MIMEType:]): Check for nil, also don't check for GIF signature
            until after the object is allocated.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4365 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c04e3a8..c643a38 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-05-13  Darin Adler  <darin at apple.com>
+
+        Reviewed by Chris and Richard.
+
+	- fixed 3257296 -- REGRESSION: crash in WebImageRendererFactory (movietickets.com)
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer initWithMIMEType:]): Check for nil.
+        (-[WebImageRenderer initWithData:MIMEType:]): Check for nil, also don't check for GIF signature
+        until after the object is allocated.
+
 2003-05-12  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index d4bbd93..0ca08f2 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -93,19 +93,23 @@ static NSMutableArray *activeImageRenderers;
 
 - (id)initWithMIMEType:(NSString *)MIME
 {
-    [super init];
-    MIMEType = [MIME copy];
+    self = [super init];
+    if (self != nil) {
+        MIMEType = [MIME copy];
+    }
     return self;
 }
 
 // Part of the workaround for bug 3090341.
 - (id)initWithData:(NSData *)data MIMEType:(NSString *)MIME
 {
+    self = [super initWithData:data];
+    if (self != nil) {
 #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
-    [self checkDataForGIFExtensionSignature:data];
+        [self checkDataForGIFExtensionSignature:data];
 #endif
-    [super initWithData:data];
-    MIMEType = [MIME copy];
+        MIMEType = [MIME copy];
+    }
     return self;
 }
 

-- 
WebKit Debian packaging