[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:27:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 75dd43f84d496582ff4c9dda1672ec1a2d64c080
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 27 22:55:54 2004 +0000
Reviewed by John.
<rdar://problem/3514733>: nil-deref in createHTMLEventListener at skiset.com
<rdar://problem/3510676>: nil-deref of view in DocumentImpl::createHTMLEventListener at kirotv.com
* khtml/xml/dom_docimpl.cpp:
(DocumentImpl::createHTMLEventListener): Don't create the listener if there is no
part. Also, get the part when going through the view. This prevents problems when
handlers are set or removed from the onUnload handler.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6129 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a54bfd5..288d84e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-02-26 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by John.
+
+ <rdar://problem/3514733>: nil-deref in createHTMLEventListener at skiset.com
+ <rdar://problem/3510676>: nil-deref of view in DocumentImpl::createHTMLEventListener at kirotv.com
+
+ * khtml/xml/dom_docimpl.cpp:
+ (DocumentImpl::createHTMLEventListener): Don't create the listener if there is no
+ part. Also, get the part when going through the view. This prevents problems when
+ handlers are set or removed from the onUnload handler.
+
2004-02-27 Maciej Stachowiak <mjs at apple.com>
Reviewed by Dave.
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 6dc25f2..29995e7 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -2389,7 +2389,11 @@ bool DocumentImpl::hasWindowEventListener(int id)
EventListener *DocumentImpl::createHTMLEventListener(QString code)
{
- return view()->part()->createHTMLEventListener(code);
+ if (part()) {
+ return part()->createHTMLEventListener(code);
+ } else {
+ return NULL;
+ }
}
void DocumentImpl::dispatchImageLoadEventSoon(RenderImage *image)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list