47696 2010-10-14 16:00:21 -0700 SelectElement should check if its renderer exists after calling Element::focus() 2010-10-14 23:27:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jamesr webkit-unassigned abarth ap dglazkov eric tonikitoo yael oldest_to_newest 294426 0 jamesr 2010-10-14 16:00:21 -0700 from SelectElement.cpp: void SelectElement::listBoxDefaultEventHandler(SelectElementData& data, Element* element, Event* event, HTMLFormElement* htmlForm) { const Vector<Element*>& listItems = data.listItems(element); if (event->type() == eventNames().mousedownEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) { element->focus(); // Convert to coords relative to the list box if needed. MouseEvent* mouseEvent = static_cast<MouseEvent*>(event); IntPoint localOffset = roundedIntPoint(element->renderer()->absoluteToLocal(mouseEvent->absoluteLocation(), false, true)); this is called by SelectElement::defaultEventHandler(), which checks if element->renderer() is NULL before doing anything else. However calling element->focus() might cause the element's renderer to go away (since it can invoke arbitrary javascript event handlers) so it's possible to crash out here. Originally reported in chromium bug tracker as http://code.google.com/p/chromium/issues/detail?id=58879. 294427 1 70792 jamesr 2010-10-14 16:01:12 -0700 Created attachment 70792 repro 294428 2 jamesr 2010-10-14 16:01:42 -0700 Repro instructions from the original bug: Steps: 1. There is one dropdown. Select 'show' - and the second one appears. 2. Focus remains on the first dropdown. Press 'b' on your keyboard - that will select 'b' in the first dropdon instead of 'show'. 3. Drag your mouse over scrollbar of the second dropdown - scroll to the bottom, for example. 4. Browser crashes 294433 3 70793 jamesr 2010-10-14 16:11:23 -0700 Created attachment 70793 Patch 294435 4 jamesr 2010-10-14 16:13:10 -0700 Patch for discussion - I haven't written proper regression tests yet or a ChangeLog body, so this isn't quite ready to land. This patch assumes that if the element has no renderer then the event is not marked as handled which is consistent with what happens if the renderer is NULL at the initial call to SelectElement::defaultEventHandler(). I dunno if this is really the proper behavior, however. 294495 5 70810 jamesr 2010-10-14 17:37:03 -0700 Created attachment 70810 Patch 294501 6 jamesr 2010-10-14 17:47:36 -0700 Committed r69827: <http://trac.webkit.org/changeset/69827> 294595 7 ap 2010-10-14 23:27:49 -0700 + * fast/forms/select-listbox-focus-displaynone.html: Added. There is no -expected.txt in ChangeLog. Not that I care - I can't think of any practical difference for anyone. 70792 2010-10-14 16:01:12 -0700 2010-10-14 16:01:12 -0700 repro chrome-bug1.html text/html 1530 jamesr 77u/PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgVHJhbnNpdGlv bmFsLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSL3hodG1sMS9EVEQveGh0bWwxLXRyYW5zaXRp b25hbC5kdGQiPg0KPGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPg0K DQo8aGVhZD4NCjxtZXRhIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD11dGYtOCIgaHR0cC1l cXVpdj0iQ29udGVudC1UeXBlIiAvPg0KPHRpdGxlPlVudGl0bGVkIDE8L3RpdGxlPg0KPC9oZWFk Pg0KDQo8Ym9keT4NCgk8Zm9ybT4NCgkJPHNlbGVjdCBpZD0iZiI+DQoJCQk8b3B0aW9uIHZhbHVl PSJhIj5hPC9vcHRpb24+DQoJCQk8b3B0aW9uIHZhbHVlPSJiIj5iPC9vcHRpb24+DQoJCQk8b3B0 aW9uIHZhbHVlPSJjIj5jPC9vcHRpb24+DQoJCQk8b3B0aW9uIHZhbHVlPSJkIj5kPC9vcHRpb24+ DQoJCQk8b3B0aW9uIHZhbHVlPSJlIj5lPC9vcHRpb24+DQoJCQk8b3B0aW9uIHZhbHVlPSJmIj5m PC9vcHRpb24+DQoJCQk8b3B0aW9uIHZhbHVlPSJnIj5nPC9vcHRpb24+DQoJCQk8b3B0aW9uIHZh bHVlPSJoIj5oPC9vcHRpb24+DQoJCQk8b3B0aW9uIHZhbHVlPSJpIj5pPC9vcHRpb24+DQoJCQk8 b3B0aW9uIHZhbHVlPSJrIj5rPC9vcHRpb24+DQoJCQk8b3B0aW9uIHZhbHVlPSJsIj5sPC9vcHRp b24+DQoJCQk8b3B0aW9uIHZhbHVlPSIxIj5zaG93PC9vcHRpb24+DQoJCTwvc2VsZWN0Pg0KCQk8 c2VsZWN0IG11bHRpcGxlPSJtdWx0aXBsZSIgaWQ9Im0iIHN0eWxlPSJoZWlnaHQ6IDMwcHgiPg0K CQkJPG9wdGlvbiB2YWx1ZT0iYSI+YTwvb3B0aW9uPg0KCQkJPG9wdGlvbiB2YWx1ZT0iYiI+Yjwv b3B0aW9uPg0KCQkJPG9wdGlvbiB2YWx1ZT0iYyI+Yzwvb3B0aW9uPg0KCQkJPG9wdGlvbiB2YWx1 ZT0iZCI+ZDwvb3B0aW9uPg0KCQkJPG9wdGlvbiB2YWx1ZT0iZSI+ZTwvb3B0aW9uPg0KCQkJPG9w dGlvbiB2YWx1ZT0iZiI+Zjwvb3B0aW9uPg0KCQkJPG9wdGlvbiB2YWx1ZT0iZyI+Zzwvb3B0aW9u Pg0KCQkJPG9wdGlvbiB2YWx1ZT0iaCI+aDwvb3B0aW9uPg0KCQkJPG9wdGlvbiB2YWx1ZT0iaSI+ aTwvb3B0aW9uPg0KCQkJPG9wdGlvbiB2YWx1ZT0iayI+azwvb3B0aW9uPg0KCQkJPG9wdGlvbiB2 YWx1ZT0ibCI+bDwvb3B0aW9uPg0KCQk8L3NlbGVjdD4NCgkJPHNjcmlwdCB0eXBlPSJ0ZXh0L2ph dmFzY3JpcHQiPg0KCQkJdmFyIGYgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZicpOw0KCQkJ dmFyIG0gPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnbScpOw0KCQkJZnVuY3Rpb24gZl9vbkNo YW5nZSgpIHsNCgkJCQlpZiAoZi52YWx1ZSA9PSAnMScpIHsNCgkJCQkJbS5zdHlsZS5kaXNwbGF5 ID0gJyc7DQoJCQkJfQ0KCQkJCWVsc2Ugew0KCQkJCQltLnN0eWxlLmRpc3BsYXkgPSAnbm9uZSc7 DQoJCQkJfQ0KCQkJfQ0KCQkJZi5vbmNoYW5nZSA9IGZfb25DaGFuZ2U7DQoJCQlmX29uQ2hhbmdl KCk7DQoJCTwvc2NyaXB0Pg0KCTwvZm9ybT4NCjwvYm9keT4NCg0KPC9odG1sPg0K 70793 2010-10-14 16:11:23 -0700 2010-10-14 17:36:54 -0700 Patch bug-47696-20101014161119.patch text/plain 3747 jamesr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDBlNGRmOTFlNjU2ZWExMzhmZjM3N2Y0NTEwYWVlODVjOWYzMDAxMS4uZjcwMTA1MDFlYjM0ZGI5 NmJlNjgxMTcyYzRjMzNjMzRhZTQwYjljNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0xMC0xNCAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlbGVjdEVsZW1lbnQgc2hvdWxkIGNoZWNrIGlm IGl0cyByZW5kZXJlciBleGlzdHMgYWZ0ZXIgY2FsbGluZyBFbGVtZW50Ojpmb2N1cygpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzY5NgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogZG9tL1NlbGVjdEVsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0RWxlbWVudDo6bWVudUxpc3REZWZhdWx0RXZl bnRIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdEVsZW1lbnQ6Omxpc3RCb3hEZWZh dWx0RXZlbnRIYW5kbGVyKToKKwogMjAxMC0xMC0xNCAgSmlhbiBMaSAgPGppYW5saUBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmNwcCBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQu Y3BwCmluZGV4IGM4YWYzOTkyMjAwNzhiY2E4NDNkOTA0ZjJiMGNiODE4YzVhN2Y2MGYuLjU3ZmIy NzdjNGU3OGI5MmRkMmJmYWQwNzY3OGZhNTBhNzg4OGNhYzYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv ZG9tL1NlbGVjdEVsZW1lbnQuY3BwCisrKyBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuY3Bw CkBAIC01NDcsNiArNTQ3LDEwIEBAIHZvaWQgU2VsZWN0RWxlbWVudDo6bWVudUxpc3REZWZhdWx0 RXZlbnRIYW5kbGVyKFNlbGVjdEVsZW1lbnREYXRhJiBkYXRhLCBFbGVtZW50CiAjaWYgQVJST1df S0VZU19QT1BfTUVOVQogICAgICAgICBpZiAoa2V5SWRlbnRpZmllciA9PSAiRG93biIgfHwga2V5 SWRlbnRpZmllciA9PSAiVXAiKSB7CiAgICAgICAgICAgICBlbGVtZW50LT5mb2N1cygpOworCisg ICAgICAgICAgICBpZiAoIWVsZW1lbnQtPnJlbmRlcmVyKCkpIC8vIENhbGxpbmcgZm9jdXMoKSBt YXkgY2F1c2UgdXMgdG8gbG9zZSBvdXIgcmVuZGVyZXIsIGluIHdoaWNoIGNhc2UgZG8gbm90IHdh bnQgdG8gaGFuZGxlIHRoZSBldmVudC4KKyAgICAgICAgICAgICAgICByZXR1cm47CisKICAgICAg ICAgICAgIC8vIFNhdmUgdGhlIHNlbGVjdGlvbiBzbyBpdCBjYW4gYmUgY29tcGFyZWQgdG8gdGhl IG5ldyBzZWxlY3Rpb24gd2hlbiBkaXNwYXRjaGluZyBjaGFuZ2UgZXZlbnRzIGR1cmluZyBzZXRT ZWxlY3RlZEluZGV4LAogICAgICAgICAgICAgLy8gd2hpY2ggZ2V0cyBjYWxsZWQgZnJvbSBSZW5k ZXJNZW51TGlzdDo6dmFsdWVDaGFuZ2VkLCB3aGljaCBnZXRzIGNhbGxlZCBhZnRlciB0aGUgdXNl ciBtYWtlcyBhIHNlbGVjdGlvbiBmcm9tIHRoZSBtZW51LgogICAgICAgICAgICAgc2F2ZUxhc3RT ZWxlY3Rpb24oZGF0YSwgZWxlbWVudCk7CkBAIC02MDUsNiArNjA5LDEwIEBAIHZvaWQgU2VsZWN0 RWxlbWVudDo6bWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVyKFNlbGVjdEVsZW1lbnREYXRhJiBk YXRhLCBFbGVtZW50CiAjaWYgU1BBQ0VfT1JfUkVUVVJOX1BPUF9NRU5VCiAgICAgICAgIGlmIChr ZXlDb2RlID09ICcgJyB8fCBrZXlDb2RlID09ICdccicpIHsKICAgICAgICAgICAgIGVsZW1lbnQt PmZvY3VzKCk7CisKKyAgICAgICAgICAgIGlmICghZWxlbWVudC0+cmVuZGVyZXIoKSkgLy8gQ2Fs bGluZyBmb2N1cygpIG1heSBjYXVzZSB1cyB0byBsb3NlIG91ciByZW5kZXJlciwgaW4gd2hpY2gg Y2FzZSBkbyBub3Qgd2FudCB0byBoYW5kbGUgdGhlIGV2ZW50LgorICAgICAgICAgICAgICAgIHJl dHVybjsKKwogICAgICAgICAgICAgLy8gU2F2ZSB0aGUgc2VsZWN0aW9uIHNvIGl0IGNhbiBiZSBj b21wYXJlZCB0byB0aGUgbmV3IHNlbGVjdGlvbiB3aGVuIGRpc3BhdGNoaW5nIGNoYW5nZSBldmVu dHMgZHVyaW5nIHNldFNlbGVjdGVkSW5kZXgsCiAgICAgICAgICAgICAvLyB3aGljaCBnZXRzIGNh bGxlZCBmcm9tIFJlbmRlck1lbnVMaXN0Ojp2YWx1ZUNoYW5nZWQsIHdoaWNoIGdldHMgY2FsbGVk IGFmdGVyIHRoZSB1c2VyIG1ha2VzIGEgc2VsZWN0aW9uIGZyb20gdGhlIG1lbnUuCiAgICAgICAg ICAgICBzYXZlTGFzdFNlbGVjdGlvbihkYXRhLCBlbGVtZW50KTsKQEAgLTYxNSw2ICs2MjMsMTAg QEAgdm9pZCBTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1bHRFdmVudEhhbmRsZXIoU2VsZWN0 RWxlbWVudERhdGEmIGRhdGEsIEVsZW1lbnQKICNlbGlmIEFSUk9XX0tFWVNfUE9QX01FTlUKICAg ICAgICAgaWYgKGtleUNvZGUgPT0gJyAnKSB7CiAgICAgICAgICAgICBlbGVtZW50LT5mb2N1cygp OworCisgICAgICAgICAgICBpZiAoIWVsZW1lbnQtPnJlbmRlcmVyKCkpIC8vIENhbGxpbmcgZm9j dXMoKSBtYXkgY2F1c2UgdXMgdG8gbG9zZSBvdXIgcmVuZGVyZXIsIGluIHdoaWNoIGNhc2UgZG8g bm90IHdhbnQgdG8gaGFuZGxlIHRoZSBldmVudC4KKyAgICAgICAgICAgICAgICByZXR1cm47CisK ICAgICAgICAgICAgIC8vIFNhdmUgdGhlIHNlbGVjdGlvbiBzbyBpdCBjYW4gYmUgY29tcGFyZWQg dG8gdGhlIG5ldyBzZWxlY3Rpb24gd2hlbiBkaXNwYXRjaGluZyBjaGFuZ2UgZXZlbnRzIGR1cmlu ZyBzZXRTZWxlY3RlZEluZGV4LAogICAgICAgICAgICAgLy8gd2hpY2ggZ2V0cyBjYWxsZWQgZnJv bSBSZW5kZXJNZW51TGlzdDo6dmFsdWVDaGFuZ2VkLCB3aGljaCBnZXRzIGNhbGxlZCBhZnRlciB0 aGUgdXNlciBtYWtlcyBhIHNlbGVjdGlvbiBmcm9tIHRoZSBtZW51LgogICAgICAgICAgICAgc2F2 ZUxhc3RTZWxlY3Rpb24oZGF0YSwgZWxlbWVudCk7CkBAIC03MTAsNiArNzIyLDkgQEAgdm9pZCBT ZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0 YSYgZGF0YSwgRWxlbWVudCoKICAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCku bW91c2Vkb3duRXZlbnQgJiYgZXZlbnQtPmlzTW91c2VFdmVudCgpICYmIHN0YXRpY19jYXN0PE1v dXNlRXZlbnQqPihldmVudCktPmJ1dHRvbigpID09IExlZnRCdXR0b24pIHsKICAgICAgICAgZWxl bWVudC0+Zm9jdXMoKTsKIAorICAgICAgICBpZiAoIWVsZW1lbnQtPnJlbmRlcmVyKCkpIC8vIENh bGxpbmcgZm9jdXMoKSBtYXkgY2F1c2UgdXMgdG8gbG9zZSBvdXIgcmVuZGVyZXIsIGluIHdoaWNo IGNhc2UgZG8gbm90IHdhbnQgdG8gaGFuZGxlIHRoZSBldmVudC4KKyAgICAgICAgICAgIHJldHVy bjsKKwogICAgICAgICAvLyBDb252ZXJ0IHRvIGNvb3JkcyByZWxhdGl2ZSB0byB0aGUgbGlzdCBi b3ggaWYgbmVlZGVkLgogICAgICAgICBNb3VzZUV2ZW50KiBtb3VzZUV2ZW50ID0gc3RhdGljX2Nh c3Q8TW91c2VFdmVudCo+KGV2ZW50KTsKICAgICAgICAgSW50UG9pbnQgbG9jYWxPZmZzZXQgPSBy b3VuZGVkSW50UG9pbnQoZWxlbWVudC0+cmVuZGVyZXIoKS0+YWJzb2x1dGVUb0xvY2FsKG1vdXNl RXZlbnQtPmFic29sdXRlTG9jYXRpb24oKSwgZmFsc2UsIHRydWUpKTsK 70810 2010-10-14 17:37:03 -0700 2010-10-14 17:43:48 -0700 Patch bug-47696-20101014173657.patch text/plain 6333 jamesr ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMDkyMzgyNjIyNDFkMTM1NjFjODA0NzUwNWJlMTFlOWRhNmFmZTZmLi5mY2E0YzIy ZmFhZDc4NWQwYWZjOTA3ZTEzYjJkZWFhN2M5OTM0MjBjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTAtMTQgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZWxlY3RFbGVtZW50 IHNob3VsZCBjaGVjayBpZiBpdHMgcmVuZGVyZXIgZXhpc3RzIGFmdGVyIGNhbGxpbmcgRWxlbWVu dDo6Zm9jdXMoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDc2OTYKKworICAgICAgICBUZXN0cyB0aGF0IGNsaWNraW5nIG9uIGEgbGlzdGJveCBzZWxl Y3Qgd2l0aCBhbiBlbGVtZW50IGhhcyBhIGJsdXIgbGlzdGVuZXIgdGhhdCBjYXVzZXMKKyAgICAg ICAgdGhlIGxpc3Rib3ggdG8gYmVjb21lIGRpc3BsYXk6bm9uZSBkb2VzIG5vdCBjcmFzaC4KKwor ICAgICAgICAqIGZhc3QvZm9ybXMvc2VsZWN0LWxpc3Rib3gtZm9jdXMtZGlzcGxheW5vbmUuaHRt bDogQWRkZWQuCisKIDIwMTAtMTAtMTQgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2Fs aWEuY29tPgogCiAgICAgICAgIEFkZCBiYXNlbGluZXMgYW5kIHBpeGVsIHJlc3VsdHMgZm9yIHNv bWUgbmV3IHRlc3RzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9zZWxlY3Qt bGlzdGJveC1mb2N1cy1kaXNwbGF5bm9uZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0 L2Zvcm1zL3NlbGVjdC1saXN0Ym94LWZvY3VzLWRpc3BsYXlub25lLWV4cGVjdGVkLnR4dApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi41ZGY2MjQxYThiNTYzNjUwNjE5YjFlOTEzNjRiYzNiZmY4YTEwMjA4Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9zZWxlY3QtbGlzdGJveC1mb2N1cy1k aXNwbGF5bm9uZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorICBQQVNTCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1saXN0Ym94LWZvY3VzLWRpc3BsYXlub25l Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC1saXN0Ym94LWZvY3VzLWRpc3Bs YXlub25lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDFmOGIxYjU3MTBiNDljYzFjYWM5YjJiNWM0ZmQ3ZmI3 OGY2M2MyMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2VsZWN0 LWxpc3Rib3gtZm9jdXMtZGlzcGxheW5vbmUuaHRtbApAQCAtMCwwICsxLDMzIEBACis8IURPQ1RZ UEUgaHRtbD4KKzxodG1sPgorPGJvZHk+CisKKzxzZWxlY3QgaWQ9Im11bHRpc2VsZWN0IiBtdWx0 aXBsZT0ibXVsdGlwbGUiPgorICAgIDxvcHRpb24gaWQ9Im9wdGlvbmEiPmE8L29wdGlvbj4KKyAg ICA8b3B0aW9uPmI8L29wdGlvbj4KKzwvc2VsZWN0PgorPGlucHV0IGlkPSJzZWxlY3RhYmxlIj4K KworPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgd2luZG93 LmxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKwordmFyIHNlbGVjdGFibGUgPSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgnc2VsZWN0YWJsZScpOwordmFyIG11bHRpc2VsZWN0ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ211bHRpc2VsZWN0Jyk7CitzZWxlY3RhYmxlLmZvY3Vz KCk7CitzZWxlY3RhYmxlLm9uYmx1ciA9IGZ1bmN0aW9uKCkgeworICAgIG11bHRpc2VsZWN0LnN0 eWxlLmRpc3BsYXk9J25vbmUnOworICAgIGRvY3VtZW50LndyaXRlKCdQQVNTJyk7Cit9OworCitp ZiAod2luZG93LmV2ZW50U2VuZGVyKSB7CisgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8obXVs dGlzZWxlY3Qub2Zmc2V0TGVmdCArIDUsIG11bHRpc2VsZWN0Lm9mZnNldFRvcCArIDUpOworICAg IGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKK30g ZWxzZSB7CisgICAgZG9jdW1lbnQud3JpdGUoIlRvIG1hbnVhbGx5IHRlc3QsIGNsaWNrIG9uIHRo ZSAnYScgb3B0aW9uIik7Cit9Cis8L3NjcmlwdD4KKworPC9ib2R5PgorPC9odG1sPgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwMGU0ZGY5 MWU2NTZlYTEzOGZmMzc3ZjQ1MTBhZWU4NWM5ZjMwMDExLi5mMTY3YzY3YWFiMzM2YjIxMjcwMDgx OWFlMzE3MTZiMDM2NzAwNzY0IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEwLTEwLTE0ICBKYW1lcyBSb2Jp bnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU2VsZWN0RWxlbWVudCBzaG91bGQgY2hlY2sgaWYgaXRzIHJl bmRlcmVyIGV4aXN0cyBhZnRlciBjYWxsaW5nIEVsZW1lbnQ6OmZvY3VzKCkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3Njk2CisKKyAgICAgICAgQWRk cyBudWxsIGNoZWNrcyBmb3IgZWxlbWVudC0+cmVuZGVyZXIoKSBhZnRlciBjYWxsaW5nIGVsZW1l bnQtPmZvY3VzKCksIHNpbmNlIGZvY3VzKCkKKyAgICAgICAgY2FuIGRpc3BhdGNoIGFuIGV2ZW50 IGFuZCBydW4gYXJiaXRyYXJ5IGphdmFzY3JpcHQgdGhhdCBtYXkgY2F1c2UgdGhlIHNlbGVjdCBl bGVtZW50CisgICAgICAgIHRvIGxvc2UgaXRzIHJlbmRlcmVyLgorCisgICAgICAgIFRlc3Q6IGZh c3QvZm9ybXMvc2VsZWN0LWxpc3Rib3gtZm9jdXMtZGlzcGxheW5vbmUuaHRtbAorCisgICAgICAg ICogZG9tL1NlbGVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0RWxlbWVu dDo6bWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVj dEVsZW1lbnQ6Omxpc3RCb3hEZWZhdWx0RXZlbnRIYW5kbGVyKToKKwogMjAxMC0xMC0xNCAgSmlh biBMaSAgPGppYW5saUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQg TGV2aW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmNwcCBiL1dlYkNv cmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwCmluZGV4IGM4YWYzOTkyMjAwNzhiY2E4NDNkOTA0ZjJi MGNiODE4YzVhN2Y2MGYuLjU3ZmIyNzdjNGU3OGI5MmRkMmJmYWQwNzY3OGZhNTBhNzg4OGNhYzYg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwCisrKyBiL1dlYkNvcmUv ZG9tL1NlbGVjdEVsZW1lbnQuY3BwCkBAIC01NDcsNiArNTQ3LDEwIEBAIHZvaWQgU2VsZWN0RWxl bWVudDo6bWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVyKFNlbGVjdEVsZW1lbnREYXRhJiBkYXRh LCBFbGVtZW50CiAjaWYgQVJST1dfS0VZU19QT1BfTUVOVQogICAgICAgICBpZiAoa2V5SWRlbnRp ZmllciA9PSAiRG93biIgfHwga2V5SWRlbnRpZmllciA9PSAiVXAiKSB7CiAgICAgICAgICAgICBl bGVtZW50LT5mb2N1cygpOworCisgICAgICAgICAgICBpZiAoIWVsZW1lbnQtPnJlbmRlcmVyKCkp IC8vIENhbGxpbmcgZm9jdXMoKSBtYXkgY2F1c2UgdXMgdG8gbG9zZSBvdXIgcmVuZGVyZXIsIGlu IHdoaWNoIGNhc2UgZG8gbm90IHdhbnQgdG8gaGFuZGxlIHRoZSBldmVudC4KKyAgICAgICAgICAg ICAgICByZXR1cm47CisKICAgICAgICAgICAgIC8vIFNhdmUgdGhlIHNlbGVjdGlvbiBzbyBpdCBj YW4gYmUgY29tcGFyZWQgdG8gdGhlIG5ldyBzZWxlY3Rpb24gd2hlbiBkaXNwYXRjaGluZyBjaGFu Z2UgZXZlbnRzIGR1cmluZyBzZXRTZWxlY3RlZEluZGV4LAogICAgICAgICAgICAgLy8gd2hpY2gg Z2V0cyBjYWxsZWQgZnJvbSBSZW5kZXJNZW51TGlzdDo6dmFsdWVDaGFuZ2VkLCB3aGljaCBnZXRz IGNhbGxlZCBhZnRlciB0aGUgdXNlciBtYWtlcyBhIHNlbGVjdGlvbiBmcm9tIHRoZSBtZW51Lgog ICAgICAgICAgICAgc2F2ZUxhc3RTZWxlY3Rpb24oZGF0YSwgZWxlbWVudCk7CkBAIC02MDUsNiAr NjA5LDEwIEBAIHZvaWQgU2VsZWN0RWxlbWVudDo6bWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVy KFNlbGVjdEVsZW1lbnREYXRhJiBkYXRhLCBFbGVtZW50CiAjaWYgU1BBQ0VfT1JfUkVUVVJOX1BP UF9NRU5VCiAgICAgICAgIGlmIChrZXlDb2RlID09ICcgJyB8fCBrZXlDb2RlID09ICdccicpIHsK ICAgICAgICAgICAgIGVsZW1lbnQtPmZvY3VzKCk7CisKKyAgICAgICAgICAgIGlmICghZWxlbWVu dC0+cmVuZGVyZXIoKSkgLy8gQ2FsbGluZyBmb2N1cygpIG1heSBjYXVzZSB1cyB0byBsb3NlIG91 ciByZW5kZXJlciwgaW4gd2hpY2ggY2FzZSBkbyBub3Qgd2FudCB0byBoYW5kbGUgdGhlIGV2ZW50 LgorICAgICAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICAgICAgLy8gU2F2ZSB0aGUgc2Vs ZWN0aW9uIHNvIGl0IGNhbiBiZSBjb21wYXJlZCB0byB0aGUgbmV3IHNlbGVjdGlvbiB3aGVuIGRp c3BhdGNoaW5nIGNoYW5nZSBldmVudHMgZHVyaW5nIHNldFNlbGVjdGVkSW5kZXgsCiAgICAgICAg ICAgICAvLyB3aGljaCBnZXRzIGNhbGxlZCBmcm9tIFJlbmRlck1lbnVMaXN0Ojp2YWx1ZUNoYW5n ZWQsIHdoaWNoIGdldHMgY2FsbGVkIGFmdGVyIHRoZSB1c2VyIG1ha2VzIGEgc2VsZWN0aW9uIGZy b20gdGhlIG1lbnUuCiAgICAgICAgICAgICBzYXZlTGFzdFNlbGVjdGlvbihkYXRhLCBlbGVtZW50 KTsKQEAgLTYxNSw2ICs2MjMsMTAgQEAgdm9pZCBTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1 bHRFdmVudEhhbmRsZXIoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVsZW1lbnQKICNlbGlmIEFS Uk9XX0tFWVNfUE9QX01FTlUKICAgICAgICAgaWYgKGtleUNvZGUgPT0gJyAnKSB7CiAgICAgICAg ICAgICBlbGVtZW50LT5mb2N1cygpOworCisgICAgICAgICAgICBpZiAoIWVsZW1lbnQtPnJlbmRl cmVyKCkpIC8vIENhbGxpbmcgZm9jdXMoKSBtYXkgY2F1c2UgdXMgdG8gbG9zZSBvdXIgcmVuZGVy ZXIsIGluIHdoaWNoIGNhc2UgZG8gbm90IHdhbnQgdG8gaGFuZGxlIHRoZSBldmVudC4KKyAgICAg ICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgICAgIC8vIFNhdmUgdGhlIHNlbGVjdGlvbiBz byBpdCBjYW4gYmUgY29tcGFyZWQgdG8gdGhlIG5ldyBzZWxlY3Rpb24gd2hlbiBkaXNwYXRjaGlu ZyBjaGFuZ2UgZXZlbnRzIGR1cmluZyBzZXRTZWxlY3RlZEluZGV4LAogICAgICAgICAgICAgLy8g d2hpY2ggZ2V0cyBjYWxsZWQgZnJvbSBSZW5kZXJNZW51TGlzdDo6dmFsdWVDaGFuZ2VkLCB3aGlj aCBnZXRzIGNhbGxlZCBhZnRlciB0aGUgdXNlciBtYWtlcyBhIHNlbGVjdGlvbiBmcm9tIHRoZSBt ZW51LgogICAgICAgICAgICAgc2F2ZUxhc3RTZWxlY3Rpb24oZGF0YSwgZWxlbWVudCk7CkBAIC03 MTAsNiArNzIyLDkgQEAgdm9pZCBTZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFu ZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudCoKICAgICBpZiAoZXZlbnQtPnR5 cGUoKSA9PSBldmVudE5hbWVzKCkubW91c2Vkb3duRXZlbnQgJiYgZXZlbnQtPmlzTW91c2VFdmVu dCgpICYmIHN0YXRpY19jYXN0PE1vdXNlRXZlbnQqPihldmVudCktPmJ1dHRvbigpID09IExlZnRC dXR0b24pIHsKICAgICAgICAgZWxlbWVudC0+Zm9jdXMoKTsKIAorICAgICAgICBpZiAoIWVsZW1l bnQtPnJlbmRlcmVyKCkpIC8vIENhbGxpbmcgZm9jdXMoKSBtYXkgY2F1c2UgdXMgdG8gbG9zZSBv dXIgcmVuZGVyZXIsIGluIHdoaWNoIGNhc2UgZG8gbm90IHdhbnQgdG8gaGFuZGxlIHRoZSBldmVu dC4KKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICAvLyBDb252ZXJ0IHRvIGNvb3JkcyBy ZWxhdGl2ZSB0byB0aGUgbGlzdCBib3ggaWYgbmVlZGVkLgogICAgICAgICBNb3VzZUV2ZW50KiBt b3VzZUV2ZW50ID0gc3RhdGljX2Nhc3Q8TW91c2VFdmVudCo+KGV2ZW50KTsKICAgICAgICAgSW50 UG9pbnQgbG9jYWxPZmZzZXQgPSByb3VuZGVkSW50UG9pbnQoZWxlbWVudC0+cmVuZGVyZXIoKS0+ YWJzb2x1dGVUb0xvY2FsKG1vdXNlRXZlbnQtPmFic29sdXRlTG9jYXRpb24oKSwgZmFsc2UsIHRy dWUpKTsK