[webkit-changes] cvs commit: WebCore/khtml/html html_formimpl.cpp
Timothy
thatcher at opensource.apple.com
Fri Nov 18 10:01:26 PST 2005
thatcher 05/11/18 10:01:26
Modified: . Tag: Safari-1-3-branch ChangeLog
khtml/html Tag: Safari-1-3-branch html_formimpl.cpp
Log:
Merged fix from TOT to Safari-1-3-branch
2005-11-17 Adele Peterson <adele at apple.com>
Reviewed by Beth.
- fix for <rdar://problem/4347856> Safari crash after browsing Fandango.
When removeFormElement is getting called in a destructor, there may not be a document.
So we don't need to worry about cleaning up the radio buttons in this case, not only to
avoid the crash, but also because the document's destructor will clean that up.
* khtml/html/html_formimpl.cpp:
(DOM::HTMLFormElementImpl::removeFormElement): Added nil check for document.
Revision Changes Path
No revision
No revision
1.335.2.27 +17 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.335.2.26
retrieving revision 1.335.2.27
diff -u -r1.335.2.26 -r1.335.2.27
--- ChangeLog 18 Nov 2005 00:56:52 -0000 1.335.2.26
+++ ChangeLog 18 Nov 2005 18:01:18 -0000 1.335.2.27
@@ -1,3 +1,20 @@
+2005-11-17 Timothy Hatcher <timothy at apple.com>
+
+ Merged fix from TOT to Safari-1-3-branch
+
+ 2005-11-17 Adele Peterson <adele at apple.com>
+
+ Reviewed by Beth.
+
+ - fix for <rdar://problem/4347856> Safari crash after browsing Fandango.
+
+ When removeFormElement is getting called in a destructor, there may not be a document.
+ So we don't need to worry about cleaning up the radio buttons in this case, not only to
+ avoid the crash, but also because the document's destructor will clean that up.
+
+ * khtml/html/html_formimpl.cpp:
+ (DOM::HTMLFormElementImpl::removeFormElement): Added nil check for document.
+
=== WebCore-315.11 ===
2005-11-17 Timothy Hatcher <timothy at apple.com>
No revision
No revision
1.156.4.6 +1 -1 WebCore/khtml/html/html_formimpl.cpp
Index: html_formimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.cpp,v
retrieving revision 1.156.4.5
retrieving revision 1.156.4.6
diff -u -r1.156.4.5 -r1.156.4.6
--- html_formimpl.cpp 14 Nov 2005 23:04:57 -0000 1.156.4.5
+++ html_formimpl.cpp 18 Nov 2005 18:01:24 -0000 1.156.4.6
@@ -735,7 +735,7 @@
void HTMLFormElementImpl::removeFormElement(HTMLGenericFormElementImpl *e)
{
- if (!e->name().isEmpty()) {
+ if (!e->name().isEmpty() && getDocument()) {
HTMLGenericFormElementImpl* currentCheckedRadio = getDocument()->checkedRadioButtonForGroup(e->name(), this);
if (currentCheckedRadio == e)
getDocument()->removeRadioButtonGroup(e->name(), this);
More information about the webkit-changes
mailing list