Changeset 12480 in webkit

Timestamp:

Jan 30, 2006 12:14:38 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by Dave Harrison.

• Fixed <rdar://problem/4378159> crash in KWQKHTMLPart::userGestureHint from javascript enabled/disabled inconsistency when pasting webpage into email or blot

• page/Frame.cpp: (Frame::userGestureHint): Check root frame's jScript() for NULL instead of checking inner frame's jScript().

After init() has been called on a frame, but before begin() has been
called, the frame can have JavaScript enabled when its parent doesn't.
(That seems wrong, so I've filed <rdar://problem/4426499> Child frame
momentarily has JavaScript enabled even though parent frame doesn't.)

Regardless, it's better programming practice to NULL check the actual
pointer you're going to use, so that's what I've done here.

• manual-tests/paste-crash.html: Added. (No automated test because the crash depends on JavaScript being disabled.)

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/paste-crash.html (added)
• page/Frame.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-01-30  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Dave Harrison.
+
+        - Fixed <rdar://problem/4378159> crash in KWQKHTMLPart::userGestureHint
+        from javascript enabled/disabled inconsistency when pasting webpage 
+        into email or blot
+
+        * page/Frame.cpp:
+        (Frame::userGestureHint): Check root frame's jScript() for NULL instead
+        of checking inner frame's jScript().
+        
+        After init() has been called on a frame, but before begin() has been 
+        called, the frame can have JavaScript enabled when its parent doesn't.
+        (That seems wrong, so I've filed <rdar://problem/4426499> Child frame 
+        momentarily has JavaScript enabled even though parent frame doesn't.)
+        
+        Regardless, it's better programming practice to NULL check the actual 
+        pointer you're going to use, so that's what I've done here.
+
+        * manual-tests/paste-crash.html: Added.
+        (No automated test because the crash depends on JavaScript being
+        disabled.)
+
 2006-01-30  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/page/Frame.cpp

@@ -3072 +3072 @@
 bool Frame::userGestureHint()
 {
-    if (jScript() && jScript()->interpreter()) {
-        Frame *rootPart = this;
-        while (rootPart->parentFrame() != 0)
-            rootPart = rootPart->parentFrame();
-        KJS::ScriptInterpreter *interpreter = rootPart->jScript()->interpreter();
-        return interpreter->wasRunByUserGesture();
-    } else
-        // if no JS, assume the user initiated this nav
-        return true;
+    Frame *rootFrame = this;
+    while (rootFrame->parentFrame())
+        rootFrame = rootFrame->parentFrame();
+
+    if (rootFrame->jScript() && rootFrame->jScript()->interpreter())
+        return rootFrame->jScript()->interpreter()->wasRunByUserGesture();
+
+    return true; // If JavaScript is disabled, a user gesture must have initiated the navigation
 }