From 61df0147f508e20bd22fab568b7c8b3c405cfad5 Mon Sep 17 00:00:00 2001 From: John Reck Date: Fri, 7 Sep 2012 11:06:49 -0700 Subject: Fix crash if SVG tries to load a resource Bug: 7089191 SVGImage is created with an EmptyFrameLoaderClient. This client returns a null networkingContext(), which will than cause ResourceHandleAndroid to crash. The fix is simple, return a load failure if we are given a null or invalid NetworkingContext Change-Id: Ib25c2449527ca7d3693b78425c0bc5f2e9a12f74 --- Source/WebCore/platform/network/android/ResourceHandleAndroid.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/Source/WebCore/platform/network/android/ResourceHandleAndroid.cpp index 4bc918b..bf5ccf5 100644 --- a/Source/WebCore/platform/network/android/ResourceHandleAndroid.cpp +++ b/Source/WebCore/platform/network/android/ResourceHandleAndroid.cpp @@ -50,6 +50,9 @@ ResourceHandle::~ResourceHandle() bool ResourceHandle::start(NetworkingContext* context) { + if (!context || !context->isValid()) + return false; + MainResourceLoader* mainLoader = context->mainResourceLoader(); bool isMainResource = static_cast(mainLoader) == static_cast(client()); RefPtr loader = ResourceLoaderAndroid::start(this, d->m_firstRequest, context->frameLoaderClient(), isMainResource, false); -- cgit v1.1