diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-01-19 11:05:27 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2011-01-19 11:05:27 -0500 |
| commit | 414529d1222ba129634445cb7b312874816c0d2f (patch) | |
| tree | b0641a4a88e22c763a685b81644eab4708025ddd /WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | |
| parent | a27a95188f8f778d90d69accb1b00e6b38879dbd (diff) | |
| download | external_webkit-414529d1222ba129634445cb7b312874816c0d2f.zip external_webkit-414529d1222ba129634445cb7b312874816c0d2f.tar.gz external_webkit-414529d1222ba129634445cb7b312874816c0d2f.tar.bz2 | |
Fix plugin crash when loading swf files.
bug: 3368265
Change-Id: Ic0ab8702d40140983be4db105f179b8b5236e6e3
Diffstat (limited to 'WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index d165afa..6726cc2 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -708,7 +708,9 @@ void FrameLoaderClientAndroid::didRunInsecureContent(SecurityOrigin*) void FrameLoaderClientAndroid::committedLoad(DocumentLoader* loader, const char* data, int length) { if (!m_manualLoader) loader->commitData(data, length); - else { + + // commit data may have created a manual plugin loader + if (m_manualLoader) { if (!m_hasSentResponseToPlugin) { m_manualLoader->didReceiveResponse(loader->response()); // Failure could cause the main document to have an error causing |