WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/loader/archive/cf/LegacyWebArchive.cpp

 /*
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 536 matching lines @@
                 LOG_ERROR("Failed to archive subresource for %s", subresourceURL.string().utf8().data());
             }
         }
     }
 
     // Add favicon if one exists for this page
     if (iconDatabase() && iconDatabase()->isEnabled()) {
         const String& iconURL = iconDatabase()->iconURLForPageURL(responseURL);
         if (!iconURL.isEmpty() && iconDatabase()->iconDataKnownForIconURL(iconURL)) {
             RefPtr<SharedBuffer> data = iconDatabase()->iconForPageURL(responseURL, IntSize(16, 16))->data();
-            RefPtr<ArchiveResource> resource = ArchiveResource::create(data.release(), KURL(iconURL), "image/x-icon", "", "");
-            subresources.append(resource.release());
+            if (data) {
+                RefPtr<ArchiveResource> resource = ArchiveResource::create(data.release(), KURL(iconURL), "image/x-icon", "", "");
+                subresources.append(resource.release());
+            }
         }
     }
 
     return create(mainResource, subresources, subframeArchives);
 }
 
 PassRefPtr<LegacyWebArchive> LegacyWebArchive::createFromSelection(Frame* frame)
 {
     if (!frame)
         return 0;
@@ skipping 17 matching lines @@
 
     Vector<PassRefPtr<LegacyWebArchive> > subframeArchives;
     subframeArchives.append(archive);
     
     archive = LegacyWebArchive::create(iframeResource.release(), subresources, subframeArchives);
     
     return archive.release();
 }
 
 }