65362 2011-07-29 00:40:19 -0700 Search field in designMode causes a crash 2011-08-01 14:11:35 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED data:text/html,<html> <body> <input type="search"> <script>document.designMode = 'on';</script> </body> </html> P1 Major --- 1 tkent rniwa adele ap cshu darin dglazkov emerick enrica hyatt leviw noel.gordon rniwa simon.fraser tonikitoo oldest_to_newest 443839 0 tkent 2011-07-29 00:40:19 -0700 http://code.google.com/p/chromium/issues/detail?id=90306 1. Open the URL 2. Focus the search field 3. Type the Del key (Backspace in Windows) 4. Crash! This is reproducible with Safari 5.0.5 - Today's WebKit nightly. In the nightly, this is a null pointer dereference. 443848 1 noel.gordon 2011-07-29 01:21:40 -0700 Program received signal EXC_BAD_ACCESS, Could not access memory. Reason: KERN_INVALID_ADDRESS at address: 0x0000000000000000 0x00000001022f7f1c in WebCore::RenderTextControl::computeLogicalHeight (this=0x12b3b23a8) at WebKit/Source/WebCore/rendering/RenderTextControl.cpp:288 288 innerTextRenderBox->marginTop() + innerTextRenderBox->marginBottom()); (gdb) backtrace #0 WebCore::RenderTextControl::computeLogicalHeight (this=0x12b3b23a8) at WebKit/Source/WebCore/rendering/RenderTextControl.cpp:288 #1 WebCore::RenderTextControlSingleLine::layout (this=0x12b3b23a8) at WebKit/Source/WebCore/rendering/RenderTextControlSingleLine.cpp:223 #2 WebCore::FrameView::layout (this=0x12b3ab190, allowSubtree=true) at WebKit/Source/WebCore/page/FrameView.cpp:1016 #3 WebCore::Document::updateLayout (this=0x12c07ae00) at WebKit/Source/WebCore/dom/Document.cpp:1620 #4 WebCore::Document::updateLayoutIgnorePendingStylesheets (this=0x12c07ae00) at WebKit/Source/WebCore/dom/Document.cpp:1651 #5 WebCore::EditCommand::updateLayout (this=0x12b21b490) at WebKit/Source/WebCore/editing/EditCommand.cpp:208 #6 WebCore::DeleteSelectionCommand::fixupWhitespace (this=0x12b21b490) at WebKit/Source/WebCore/editing/DeleteSelectionCommand.cpp:558 #7 WebCore::DeleteSelectionCommand::doApply (this=0x12b21b490) at WebKit/Source/WebCore/editing/DeleteSelectionCommand.cpp:832 #8 WebCore::EditCommand::apply (this=0x12b21b490) at WebKit/Source/WebCore/editing/EditCommand.cpp:92 #9 WebCore::CompositeEditCommand::applyCommandToComposite (this=0x12b21b010, cmd=@0x7fff5fbfe0e0) at WebKit/Source/WebCore/editing/CompositeEditCommand.cpp:102 #10 WebCore::CompositeEditCommand::deleteSelection (this=0x12b21b010, selection=@0x7fff5fbfe2e0, smartDelete=false, mergeBlocksAfterDelete=true, replace=false, expandForSpecialElements=true) at WebKit/Source/WebCore/editing/CompositeEditCommand.cpp:409 #11 WebCore::TypingCommand::deleteKeyPressed (this=0x12b21b010, granularity=WebCore::CharacterGranularity, killRing=false) at WebKit/Source/WebCore/editing/TypingCommand.cpp:548 #12 WebCore::TypingCommand::doApply (this=0x12b21b010) at WebKit/Source/WebCore/editing/TypingCommand.cpp:292 #13 WebCore::EditCommand::apply (this=0x12b21b010) at WebKit/Source/WebCore/editing/EditCommand.cpp:92 #14 WebCore::TypingCommand::deleteKeyPressed (document=0x12c07ae00, options=0, granularity=WebCore::CharacterGranularity) at WebKit/Source/WebCore/editing/TypingCommand.cpp:117 #15 WebCore::Editor::deleteWithDirection (this=0x109015a38, direction=WebCore::DirectionBackward, granularity=WebCore::CharacterGranularity, killRing=false, isTypingAction=true) at WebKit/Source/WebCore/editing/Editor.cpp:315 #16 WebCore::executeDeleteBackward (frame=0x109015400) at WebKit/Source/WebCore/editing/EditorCommand.cpp:330 #17 WebCore::Editor::Command::execute (this=0x7fff5fbfe700, parameter=@0x7fff5fbfe690, triggeringEvent=0x12b2195c0) at WebKit/Source/WebCore/editing/EditorCommand.cpp:1648 #18 WebCore::Editor::Command::execute (this=0x7fff5fbfe700, triggeringEvent=0x12b2195c0) at WebKit/Source/WebCore/editing/EditorCommand.cpp:1653 #19 -[WebHTMLView(WebNSTextInputSupport) doCommandBySelector:] (self=0x12b3a7470, _cmd=0x7fff8295951c, selector=0x7fff8298f4cf) at WebKit/Source/WebKit/mac/WebView/WebHTMLView.mm:5805 #20 -[WebHTMLView(WebInternal) _executeSavedKeypressCommands] (self=0x12b3a7470, _cmd=0x101218398) at WebKit/Source/WebKit/mac/WebView/WebHTMLView.mm:5274 #21 -[WebHTMLView(WebInternal) _interpretKeyEvent:savingCommands:] (self=0x12b3a7470, _cmd=0x1011ff8c2, event=0x12b2195c0, savingCommands=0 '\0') at WebKit/Source/WebKit/mac/WebView/WebHTMLView.mm:5333 #22 WebEditorClient::handleKeyboardEvent (this=0x1089258a0, event=0x12b2195c0) at WebKit/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm:593 #23 WebCore::Editor::handleKeyboardEvent (this=0x109015a38, event=0x12b2195c0) at WebKit/Source/WebCore/editing/Editor.cpp:144 #24 WebCore::EventHandler::defaultKeyboardEventHandler (this=0x109015be8, event=0x12b2195c0) at WebKit/Source/WebCore/page/EventHandler.cpp:2658 #25 WebCore::Node::defaultEventHandler (this=0x12b3b1b10, event=0x12b2195c0) at WebKit/Source/WebCore/dom/Node.cpp:2811 #26 WebCore::EventDispatcher::dispatchEvent (this=0x7fff5fbfeb40, event=@0x7fff5fbfeb00) at WebKit/Source/WebCore/dom/EventDispatcher.cpp:346 #27 WebCore::EventDispatchMediator::dispatchEvent (this=0x7fff5fbfebb0, dispatcher=0x7fff5fbfeb40) at WebKit/Source/WebCore/dom/Event.cpp:303 #28 WebCore::EventDispatcher::dispatchEvent (node=0x12b3b1b10, mediator=@0x7fff5fbfebb0) at WebKit/Source/WebCore/dom/EventDispatcher.cpp:54 #29 WebCore::Node::dispatchEvent (this=0x12b3b1b10, event=@0x7fff5fbfec10) at WebKit/Source/WebCore/dom/Node.cpp:2717 #30 WebCore::EventTarget::dispatchEvent (this=0x12b3b1b10, event=@0x7fff5fbfed40, ec=@0x7fff5fbfedcc) at WebKit/Source/WebCore/dom/EventTarget.cpp:320 #31 WebCore::EventHandler::keyEvent (this=0x109015be8, initialKeyEvent=@0x7fff5fbfee30) at WebKit/Source/WebCore/page/EventHandler.cpp:2562 #32 WebCore::EventHandler::keyEvent (this=0x109015be8, event=0x12b2110a0) at WebKit/Source/WebCore/page/mac/EventHandlerMac.mm:129 #33 -[WebHTMLView keyDown:] (self=0x12b3a7470, _cmd=0x7fff82966400, event=0x12b2110a0) at WebKit/Source/WebKit/mac/WebView/WebHTMLView.mm:4044 443997 2 ap 2011-07-29 10:47:39 -0700 > This is reproducible with Safari 5.0.5 - Today's WebKit nightly. To clarify, this is not a regression from Safari/WebKit 5.0.5. 444037 3 rniwa 2011-07-29 12:06:41 -0700 The problem is that search & cancel buttons and innerTextElement become editable in design mode and DeleteSelectionCommand liberally remove them all :( We should modify rendererIsEditable so that we don't treat these elements as editable. 444091 4 rniwa 2011-07-29 14:12:02 -0700 I talked with Dimitri and Levi and we agreed that the correct approach here is not to propagate designMode=true into the shadow DOM. So this crash can be fixed by one line change: --- Source/WebCore/dom/Node.cpp (revision 92006) +++ Source/WebCore/dom/Node.cpp (working copy) @@ -781,7 +781,7 @@ bool Node::rendererIsEditable(EditableLevel editableLevel) const { - if (document()->frame() && document()->frame()->page() && document()->frame()->page()->isEditable()) + if (document()->frame() && document()->frame()->page() && document()->frame()->page()->isEditable() && !shadowTreeRootNode()) return true; 444133 5 rniwa 2011-07-29 15:07:50 -0700 Oops, forget about my last comment. That's not true at all because designMode is now set via CSS style. But RenderTextControlSingleLine::createInnerBlockStyle sets -webkit-user-modify: readonly so I don't know why nodes are editable in the shadow DOM. Need more investigation here. Does shadow DOM inherit document's style? 444808 6 102544 rniwa 2011-08-01 12:33:21 -0700 Created attachment 102544 fixes the bug 444809 7 102544 dglazkov 2011-08-01 12:37:39 -0700 Comment on attachment 102544 fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=102544&action=review > Source/WebCore/css/CSSStyleSelector.cpp:1940 > + if (isAtShadowBoundary(e)) I wonder if you could just test for e->isShadowRoot(). I think that would make the fix more correct in the sense you mention in the ChangeLog. 444829 8 102544 rniwa 2011-08-01 13:35:34 -0700 Comment on attachment 102544 fixes the bug Found a much better solution. 444834 9 102549 rniwa 2011-08-01 13:40:23 -0700 Created attachment 102549 fixes the bug with much less hack 444837 10 102549 rniwa 2011-08-01 13:42:21 -0700 Comment on attachment 102549 fixes the bug with much less hack View in context: https://bugs.webkit.org/attachment.cgi?id=102549&action=review > Source/WebCore/css/CSSStyleSelector.cpp:1365 > + // Don't propagate user-modify into shadow DOM I guess this comment just repeats what the code says. Will remove it before landing the patch if r+ed. 444849 11 102549 darin 2011-08-01 13:54:09 -0700 Comment on attachment 102549 fixes the bug with much less hack View in context: https://bugs.webkit.org/attachment.cgi?id=102549&action=review >> Source/WebCore/css/CSSStyleSelector.cpp:1365 >> + // Don't propagate user-modify into shadow DOM > > I guess this comment just repeats what the code says. Will remove it before landing the patch if r+ed. Instead of removing it you could put a why comment in. Something like “Even if surrounding content is user-editable, shadow DOM should act as a single unit, and not necessarily be editable.” 444855 12 rniwa 2011-08-01 14:08:22 -0700 Committed r92139: <http://trac.webkit.org/changeset/92139> 444856 13 rniwa 2011-08-01 14:09:19 -0700 (In reply to comment #11) > Instead of removing it you could put a why comment in. Something like “Even if surrounding content is user-editable, shadow DOM should act as a single unit, and not necessarily be editable.” Will do now. 444858 14 rniwa 2011-08-01 14:11:35 -0700 Huh... I somehow landed the patch with the comment in it. Anyway, updated to what Darin suggested in http://trac.webkit.org/changeset/92140. 102544 2011-08-01 12:33:21 -0700 2011-08-01 13:35:34 -0700 fixes the bug bug-65362-20110801123320.patch text/plain 5098 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyMTM1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDgtMDEgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU2VhcmNoIGZpZWxkIGluIGRlc2ln bk1vZGUgY2F1c2VzIGEgY3Jhc2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY1MzYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIGNyYXNoZWQgd2FzIGNhdXNlZCBieSBlZGl0aW5nIGNvZGUgaW5hZHZl cnRlbnRseSBkZWxldGluZyBzZWFyY2ggYW5kIGNhbmNlbCBidXR0b25zIGluIHRoZSBkZXNpZ24g bW9kZS4KKyAgICAgICAgRml4ZWQgdGhlIGJ1ZyBieSBvdmVycmlkaW5nIHVzZXItbW9kaWZ5IHBy b3BlcnR5IGluIHNoYWRvdyByb290J3MgY2hpbGRyZW4gYnkgcmVhZG9ubHkuCisKKyAgICAgICAg VGhpcyBmaXggaXMgbm90ICJjb3JyZWN0IiBpbiB0aGUgc2Vuc2UgdGhhdCBpdCB3aWxsIGZvcmNl IHRoZSBzaGFkb3cgcm9vdCdzIGNoaWxkcmVuIHRvIGJlIGFsd2F5cyBub3QgZWRpdGFibGUKKyAg ICAgICAgcmVnYXJkbGVzcyBvZiBDU1MgcnVsZXMgb3IgaW5saW5lIHN0eWxlcy4gSG93ZXZlciwg ZHVlIHRvIHVzZXItbW9kaWZ5IGJlaW5nIGEgcmFyZSBpbmhlcml0YWJsZSBwcm9wZXJ0eSwKKyAg ICAgICAgdGhlcmUgaXMgbm8gY29uY2lzZSB3YXkgb2Ygb3ZlcnJpZGluZyBpdCBhdCB0aGUgc2hh ZG93IGJvdW5kYXJ5LgorCisgICAgICAgIFRlc3Q6IGVkaXRpbmcvaW5wdXQvc2VhcmNoLWZpZWxk LWNyYXNoLWluLWRlc2lnbm1vZGUuaHRtbAorCisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0 b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6YWRqdXN0UmVuZGVy U3R5bGUpOgorICAgICAgICAqIGRvbS9Ob2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6 OnJlbmRlcmVySXNFZGl0YWJsZSk6CisKIDIwMTEtMDctMjggIEFiaGlzaGVrIEFyeWEgIDxpbmZl cm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZWdyZXNzaW9uKDgyMTQ0KTogQ3Jhc2ggaW4g VHJhaWxpbmdPYmplY3RzOjp1cGRhdGVNaWRwb2ludHNGb3JUcmFpbGluZ0JveGVzCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCShyZXZpc2lvbiA5MjEzMCkKKysr IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTkzMyw3ICsxOTMzLDEzIEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YWRqdXN0UmVuZGVy U3R5bGUKICAgICAgICAgc3R5bGUtPnNldFRleHREZWNvcmF0aW9uc0luRWZmZWN0KHN0eWxlLT50 ZXh0RGVjb3JhdGlvbigpKTsKICAgICBlbHNlCiAgICAgICAgIHN0eWxlLT5hZGRUb1RleHREZWNv cmF0aW9uc0luRWZmZWN0KHN0eWxlLT50ZXh0RGVjb3JhdGlvbigpKTsKLSAgICAKKworICAgIC8v IEZJWE1FOiBUaGlzIGZvcmNlcyBzaGFkb3cgcm9vdCdzIGNoaWxkcmVuIHRvIGJlIGFsd2F5cyBy ZWFkIG9ubHkuCisgICAgLy8gSG93ZXZlciwgYXBwbHlQcm9wZXJ0eSBpcyBub3QgY2FsbGVkIHdo ZW4gaW5oZXJpdGluZyB1c2VyLW1vZGlmeSB2YWx1ZSBmb3IgaXQgaXMgYSByYXJlIGluaGVyaXRl ZCBkYXRhCisgICAgLy8gYW5kIHdlIGNhbid0IGRldGVjdCB3aGV0aGVyIHVzZXItbW9kaWZ5IGlz IHNldCBieSBzdHlsZSBydWxlcyBvciBub3QgYWZ0ZXIgdGhlIGZhY3QuCisgICAgaWYgKGlzQXRT aGFkb3dCb3VuZGFyeShlKSkKKyAgICAgICAgc3R5bGUtPnNldFVzZXJNb2RpZnkoUkVBRF9PTkxZ KTsKKwogICAgIC8vIElmIGVpdGhlciBvdmVyZmxvdyB2YWx1ZSBpcyBub3QgdmlzaWJsZSwgY2hh bmdlIHRvIGF1dG8uCiAgICAgaWYgKHN0eWxlLT5vdmVyZmxvd1goKSA9PSBPTUFSUVVFRSAmJiBz dHlsZS0+b3ZlcmZsb3dZKCkgIT0gT01BUlFVRUUpCiAgICAgICAgIHN0eWxlLT5zZXRPdmVyZmxv d1koT01BUlFVRUUpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAkocmV2aXNpb24gOTIxMzApCisrKyBT b3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc4MSw3ICs3ODEs NyBAQCBib29sIE5vZGU6OmlzQ29udGVudEVkaXRhYmxlKCkKIAogYm9vbCBOb2RlOjpyZW5kZXJl cklzRWRpdGFibGUoRWRpdGFibGVMZXZlbCBlZGl0YWJsZUxldmVsKSBjb25zdAogewotICAgIGlm IChkb2N1bWVudCgpLT5mcmFtZSgpICYmIGRvY3VtZW50KCktPmZyYW1lKCktPnBhZ2UoKSAmJiBk b2N1bWVudCgpLT5mcmFtZSgpLT5wYWdlKCktPmlzRWRpdGFibGUoKSkKKyAgICBpZiAoZG9jdW1l bnQoKS0+ZnJhbWUoKSAmJiBkb2N1bWVudCgpLT5mcmFtZSgpLT5wYWdlKCkgJiYgZG9jdW1lbnQo KS0+ZnJhbWUoKS0+cGFnZSgpLT5pc0VkaXRhYmxlKCkgJiYgIXNoYWRvd1RyZWVSb290Tm9kZSgp KQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIC8vIElkZWFsbHkgd2UnZCBjYWxsIEFTU0VS VCghbmVlZHNTdHlsZVJlY2FsYygpKSBoZXJlLCBidXQKSW5kZXg6IExheW91dFRlc3RzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyMTM1 KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDgtMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgU2VhcmNoIGZpZWxkIGluIGRlc2lnbk1vZGUgY2F1c2VzIGEgY3Jhc2gKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MzYyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgdGVzdCB0byBlbnN1cmUg V2ViS2l0IGRvZXNuJ3QgY3Jhc2ggd2hlbiBhIHVzZXIgdHJpZXMgdG8gZGVsZXRlIGluc2lkZQor ICAgICAgICBhbiBlbXB0eSBzZWFyY2ggZmllbGQgaW4gdGhlIGRlc2lnbiBtb2RlLgorCisgICAg ICAgICogZWRpdGluZy9pbnB1dC9zZWFyY2gtZmllbGQtY3Jhc2gtaW4tZGVzaWdubW9kZS1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvaW5wdXQvc2VhcmNoLWZpZWxkLWNy YXNoLWluLWRlc2lnbm1vZGUuaHRtbDogQWRkZWQuCisKIDIwMTEtMDctMjggIEFiaGlzaGVrIEFy eWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZWdyZXNzaW9uKDgyMTQ0KTog Q3Jhc2ggaW4gVHJhaWxpbmdPYmplY3RzOjp1cGRhdGVNaWRwb2ludHNGb3JUcmFpbGluZ0JveGVz CkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2lucHV0L3NlYXJjaC1maWVsZC1jcmFzaC1pbi1k ZXNpZ25tb2RlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5n L2lucHV0L3NlYXJjaC1maWVsZC1jcmFzaC1pbi1kZXNpZ25tb2RlLWV4cGVjdGVkLnR4dAkocmV2 aXNpb24gMCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvaW5wdXQvc2VhcmNoLWZpZWxkLWNyYXNo LWluLWRlc2lnbm1vZGUtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMgQEAK K1RoaXMgdGVzdCBlbnN1cmVzIFdlYktpdCBkb2VzIG5vdCBjcmFzaCB3aGVuIHVzZXIgbW9kaWZp ZXMgdGhlIGNvbnRlbnRzIG9mIHNlYXJjaCBmaWVsZHMgaW4gdGhlIGRlc2lnbiBtb2RlLiBXZWJL aXQgc2hvdWxkIG5vdCBjcmFzaCBhbmQgeW91IHNob3VsZCBzZWUgUEFTUyBiZWxvdzoKKworIFBB U1MKSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvaW5wdXQvc2VhcmNoLWZpZWxkLWNyYXNoLWlu LWRlc2lnbm1vZGUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5nL2lucHV0 L3NlYXJjaC1maWVsZC1jcmFzaC1pbi1kZXNpZ25tb2RlLmh0bWwJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9lZGl0aW5nL2lucHV0L3NlYXJjaC1maWVsZC1jcmFzaC1pbi1kZXNpZ25tb2Rl Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjAgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0 bWw+Cis8Ym9keT4KKzxwPlRoaXMgdGVzdCBlbnN1cmVzIFdlYktpdCBkb2VzIG5vdCBjcmFzaCB3 aGVuIHVzZXIgbW9kaWZpZXMgdGhlIGNvbnRlbnRzIG9mIHNlYXJjaCBmaWVsZHMgaW4gdGhlIGRl c2lnbiBtb2RlLgorV2ViS2l0IHNob3VsZCBub3QgY3Jhc2ggYW5kIHlvdSBzaG91bGQgc2VlIFBB U1MgYmVsb3c6PC9wPgorPGlucHV0IHR5cGU9InNlYXJjaCI+Cis8c2NyaXB0PgorCitpZiAod2lu ZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBB c1RleHQoKTsKKworZG9jdW1lbnQuZGVzaWduTW9kZSA9ICdvbic7Citkb2N1bWVudC5nZXRFbGVt ZW50c0J5VGFnTmFtZSgnaW5wdXQnKVswXS5mb2N1cygpOworZG9jdW1lbnQuZXhlY0NvbW1hbmQo J2RlbGV0ZScsIGZhbHNlLCBudWxsKTsKKworZG9jdW1lbnQud3JpdGUoJ1BBU1MnKTsKKworPC9z Y3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 102549 2011-08-01 13:40:23 -0700 2011-08-01 13:54:09 -0700 fixes the bug with much less hack bug-65362-20110801134022.patch text/plain 5624 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyMTM2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDgtMDEgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU2VhcmNoIGZpZWxkIGluIGRlc2ln bk1vZGUgY2F1c2VzIGEgY3Jhc2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY1MzYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIGNyYXNoZWQgd2FzIGNhdXNlZCBieSBlZGl0aW5nIGNvZGUgaW5hZHZl cnRlbnRseSBkZWxldGluZyBzZWFyY2ggYW5kIGNhbmNlbCBidXR0b25zIGluIHRoZSBkZXNpZ24g bW9kZS4KKyAgICAgICAgRml4ZWQgdGhlIGJ1ZyBieSBhdm9pZCBpbmhlcml0aW5nIHVzZXItbW9k aWZ5IHByb3BlcnR5IGZyb20gdGhlIHNoYWRvdyBob3N0LgorCisgICAgICAgIFRlc3Q6IGVkaXRp bmcvaW5wdXQvc2VhcmNoLWZpZWxkLWNyYXNoLWluLWRlc2lnbm1vZGUuaHRtbAorCisgICAgICAg ICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNBdFNoYWRv d0JvdW5kYXJ5KTogTW92ZWQuCisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjpz dHlsZUZvckVsZW1lbnQpOiBPdmVycmlkZXMgLXdlYmtpdC11c2VyLW1vZGlmeSBieSB0aGUgaW5p dGlhbCB2YWx1ZSBhZnRlciBtX3N0eWxlCisgICAgICAgIGluaGVyaXRlZCB0aGUgdmFsdWVzIGZy b20gbV9wYXJlbnRTdHlsZSBidXQgYmVmb3JlIGFwcGx5aW5nIG1hdGNoZWQgcnVsZXMuCisgICAg ICAgICogZG9tL05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6cmVuZGVyZXJJc0Vk aXRhYmxlKTogSWdub3JlIHBhZ2UncyBlZGl0YWJpbGl0eSBpbnNpZGUgYSBzaGFkb3cgRE9NLgor CiAyMDExLTA3LTI4ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmVncmVzc2lvbig4MjE0NCk6IENyYXNoIGluIFRyYWlsaW5nT2JqZWN0czo6dXBkYXRl TWlkcG9pbnRzRm9yVHJhaWxpbmdCb3hlcwpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0 eWxlU2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHls ZVNlbGVjdG9yLmNwcAkocmV2aXNpb24gOTIxMzApCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NT U3R5bGVTZWxlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyOTksNiArMTI5OSwxNSBAQCBQ YXNzUmVmUHRyPFJlbmRlclN0eWxlPiBDU1NTdHlsZVNlbGVjdG9yCiAgICAgcmV0dXJuIGRvY3Vt ZW50U3R5bGUucmVsZWFzZSgpOwogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNoYWRvd0Jv dW5kYXJ5KEVsZW1lbnQqIGVsZW1lbnQpCit7CisgICAgaWYgKCFlbGVtZW50KQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICBDb250YWluZXJOb2RlKiBwYXJlbnROb2RlID0gZWxlbWVudC0+ cGFyZW50Tm9kZSgpOworICAgIHJldHVybiBwYXJlbnROb2RlICYmIHBhcmVudE5vZGUtPmlzU2hh ZG93Um9vdCgpOworfQorCiAvLyBJZiByZXNvbHZlRm9yUm9vdERlZmF1bHQgaXMgdHJ1ZSwgc3R5 bGUgYmFzZWQgb24gdXNlciBhZ2VudCBzdHlsZSBzaGVldCBvbmx5LiBUaGlzIGlzIHVzZWQgaW4g bWVkaWEgcXVlcmllcywgd2hlcmUKIC8vIHJlbGF0aXZlIHVuaXRzIGFyZSBpbnRlcnByZXRlZCBh Y2NvcmRpbmcgdG8gZG9jdW1lbnQgcm9vdCBlbGVtZW50IHN0eWxlLCBzdHlsZWQgb25seSB3aXRo IFVBIHN0eWxlc2hlZXQKIApAQCAtMTM1Myw2ICsxMzYyLDEwIEBAIFBhc3NSZWZQdHI8UmVuZGVy U3R5bGU+IENTU1N0eWxlU2VsZWN0b3IKICAgICAgICAgbV9zdHlsZS0+Zm9udCgpLnVwZGF0ZSgw KTsKICAgICB9CiAKKyAgICAvLyBEb24ndCBwcm9wYWdhdGUgdXNlci1tb2RpZnkgaW50byBzaGFk b3cgRE9NCisgICAgaWYgKGlzQXRTaGFkb3dCb3VuZGFyeShlKSkKKyAgICAgICAgbV9zdHlsZS0+ c2V0VXNlck1vZGlmeShSZW5kZXJTdHlsZTo6aW5pdGlhbFVzZXJNb2RpZnkoKSk7CisKICAgICBp ZiAoZS0+aXNMaW5rKCkpIHsKICAgICAgICAgbV9zdHlsZS0+c2V0SXNMaW5rKHRydWUpOwogICAg ICAgICBtX3N0eWxlLT5zZXRJbnNpZGVMaW5rKG1fZWxlbWVudExpbmtTdGF0ZSk7CkBAIC0xODAz LDE1ICsxODE2LDYgQEAgc3RhdGljIHZvaWQgYWRkSW50cmluc2ljTWFyZ2lucyhSZW5kZXJTdAog ICAgIH0KIH0KIAotc3RhdGljIGlubGluZSBib29sIGlzQXRTaGFkb3dCb3VuZGFyeShFbGVtZW50 KiBlbGVtZW50KQotewotICAgIGlmICghZWxlbWVudCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwot Ci0gICAgQ29udGFpbmVyTm9kZSogcGFyZW50Tm9kZSA9IGVsZW1lbnQtPnBhcmVudE5vZGUoKTsK LSAgICByZXR1cm4gcGFyZW50Tm9kZSAmJiBwYXJlbnROb2RlLT5pc1NoYWRvd1Jvb3QoKTsKLX0K LQogdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphZGp1c3RSZW5kZXJTdHlsZShSZW5kZXJTdHlsZSog c3R5bGUsIFJlbmRlclN0eWxlKiBwYXJlbnRTdHlsZSwgRWxlbWVudCAqZSkKIHsKICAgICAvLyBD YWNoZSBvdXIgb3JpZ2luYWwgZGlzcGxheS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2Rl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAJKHJldmlzaW9u IDkyMTMwKQorKysgU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC03ODEsNyArNzgxLDcgQEAgYm9vbCBOb2RlOjppc0NvbnRlbnRFZGl0YWJsZSgpCiAKIGJvb2wg Tm9kZTo6cmVuZGVyZXJJc0VkaXRhYmxlKEVkaXRhYmxlTGV2ZWwgZWRpdGFibGVMZXZlbCkgY29u c3QKIHsKLSAgICBpZiAoZG9jdW1lbnQoKS0+ZnJhbWUoKSAmJiBkb2N1bWVudCgpLT5mcmFtZSgp LT5wYWdlKCkgJiYgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+cGFnZSgpLT5pc0VkaXRhYmxlKCkpCisg ICAgaWYgKGRvY3VtZW50KCktPmZyYW1lKCkgJiYgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+cGFnZSgp ICYmIGRvY3VtZW50KCktPmZyYW1lKCktPnBhZ2UoKS0+aXNFZGl0YWJsZSgpICYmICFzaGFkb3dU cmVlUm9vdE5vZGUoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAvLyBJZGVhbGx5IHdl J2QgY2FsbCBBU1NFUlQoIW5lZWRzU3R5bGVSZWNhbGMoKSkgaGVyZSwgYnV0CkluZGV4OiBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShy ZXZpc2lvbiA5MjEzNSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE2IEBACisyMDExLTA4LTAxICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQu b3JnPgorCisgICAgICAgIFNlYXJjaCBmaWVsZCBpbiBkZXNpZ25Nb2RlIGNhdXNlcyBhIGNyYXNo CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTM2Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIHRl c3QgdG8gZW5zdXJlIFdlYktpdCBkb2Vzbid0IGNyYXNoIHdoZW4gYSB1c2VyIHRyaWVzIHRvIGRl bGV0ZSBpbnNpZGUKKyAgICAgICAgYW4gZW1wdHkgc2VhcmNoIGZpZWxkIGluIHRoZSBkZXNpZ24g bW9kZS4KKworICAgICAgICAqIGVkaXRpbmcvaW5wdXQvc2VhcmNoLWZpZWxkLWNyYXNoLWluLWRl c2lnbm1vZGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBlZGl0aW5nL2lucHV0L3Nl YXJjaC1maWVsZC1jcmFzaC1pbi1kZXNpZ25tb2RlLmh0bWw6IEFkZGVkLgorCiAyMDExLTA3LTI4 ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVncmVz c2lvbig4MjE0NCk6IENyYXNoIGluIFRyYWlsaW5nT2JqZWN0czo6dXBkYXRlTWlkcG9pbnRzRm9y VHJhaWxpbmdCb3hlcwpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9pbnB1dC9zZWFyY2gtZmll bGQtY3Jhc2gtaW4tZGVzaWdubW9kZS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvZWRpdGluZy9pbnB1dC9zZWFyY2gtZmllbGQtY3Jhc2gtaW4tZGVzaWdubW9kZS1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL2lucHV0L3NlYXJj aC1maWVsZC1jcmFzaC1pbi1kZXNpZ25tb2RlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSwzIEBACitUaGlzIHRlc3QgZW5zdXJlcyBXZWJLaXQgZG9lcyBub3QgY3Jhc2ggd2hl biB1c2VyIG1vZGlmaWVzIHRoZSBjb250ZW50cyBvZiBzZWFyY2ggZmllbGRzIGluIHRoZSBkZXNp Z24gbW9kZS4gV2ViS2l0IHNob3VsZCBub3QgY3Jhc2ggYW5kIHlvdSBzaG91bGQgc2VlIFBBU1Mg YmVsb3c6CisKKyBQQVNTCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2lucHV0L3NlYXJjaC1m aWVsZC1jcmFzaC1pbi1kZXNpZ25tb2RlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv ZWRpdGluZy9pbnB1dC9zZWFyY2gtZmllbGQtY3Jhc2gtaW4tZGVzaWdubW9kZS5odG1sCShyZXZp c2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9pbnB1dC9zZWFyY2gtZmllbGQtY3Jhc2gt aW4tZGVzaWdubW9kZS5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDIwIEBACis8IURPQ1RZ UEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8cD5UaGlzIHRlc3QgZW5zdXJlcyBXZWJLaXQgZG9l cyBub3QgY3Jhc2ggd2hlbiB1c2VyIG1vZGlmaWVzIHRoZSBjb250ZW50cyBvZiBzZWFyY2ggZmll bGRzIGluIHRoZSBkZXNpZ24gbW9kZS4KK1dlYktpdCBzaG91bGQgbm90IGNyYXNoIGFuZCB5b3Ug c2hvdWxkIHNlZSBQQVNTIGJlbG93OjwvcD4KKzxpbnB1dCB0eXBlPSJzZWFyY2giPgorPHNjcmlw dD4KKworaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICBsYXlvdXRUZXN0Q29u dHJvbGxlci5kdW1wQXNUZXh0KCk7CisKK2RvY3VtZW50LmRlc2lnbk1vZGUgPSAnb24nOworZG9j dW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ2lucHV0JylbMF0uZm9jdXMoKTsKK2RvY3VtZW50 LmV4ZWNDb21tYW5kKCdkZWxldGUnLCBmYWxzZSwgbnVsbCk7CisKK2RvY3VtZW50LndyaXRlKCdQ QVNTJyk7CisKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=