diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-15 11:33:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-15 11:33:05 -0700 |
| commit | c55ff27e90020786b49c7652a4cd71e71bfc8548 (patch) | |
| tree | 3c88dd92fbf5929f878cf63eb11f5630d5157851 /WebCore | |
| parent | 0f07938f7e51e7a7eb4239b8a30e64b68dac8c66 (diff) | |
| parent | b4cbd6b88943a0e01d235c581bcf62f9e5acf4a3 (diff) | |
| download | external_webkit-c55ff27e90020786b49c7652a4cd71e71bfc8548.zip external_webkit-c55ff27e90020786b49c7652a4cd71e71bfc8548.tar.gz external_webkit-c55ff27e90020786b49c7652a4cd71e71bfc8548.tar.bz2 | |
Merge change 4191 into donut
* changes:
detect null pointer in webkit script exception
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bindings/js/JSDOMBinding.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/bindings/js/JSDOMBinding.cpp b/WebCore/bindings/js/JSDOMBinding.cpp index 5db8791..bb3e1b5 100644 --- a/WebCore/bindings/js/JSDOMBinding.cpp +++ b/WebCore/bindings/js/JSDOMBinding.cpp @@ -412,6 +412,8 @@ void reportException(JSC::ExecState* exec, JSValuePtr exception) exec->clearException(); ScriptExecutionContext* scriptExecutionContext = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext(); + if (!scriptExecutionContext) + return; scriptExecutionContext->reportException(errorMessage, lineNumber, exceptionSourceURL); } |