130095 2014-03-11 15:55:38 -0700 [iOS WebKit2] Crash when trying to select inside a video element with longpress. 2014-03-12 16:24:22 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica oldest_to_newest 989440 0 enrica 2014-03-11 15:55:38 -0700 Repro steps: Launch Safari (WK2) Nevigate to www.devour.com and start playing a video. Tap and hold inside the video element. Expected No crash and no selection. Actual Attempt to perform block selection and crash.  <rdar://problem/16294534> 989441 1 226440 enrica 2014-03-11 15:59:52 -0700 Created attachment 226440 Patch 989476 2 226454 enrica 2014-03-11 18:01:03 -0700 Created attachment 226454 Patch2 989478 3 226455 enrica 2014-03-11 18:02:49 -0700 Created attachment 226455 Patch3 989489 4 226455 benjamin 2014-03-11 18:35:42 -0700 Comment on attachment 226455 Patch3 View in context: https://bugs.webkit.org/attachment.cgi?id=226455&action=review > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:562 > - return range; > + return range->collapsed(ASSERT_NO_EXCEPTION) ? nullptr : range; Is this related? > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:1492 > + if (isHTMLVideoElement(hitNode) || isHTMLAudioElement(hitNode)) > + return; Let's make this explicit. What about adding a flag "canStartSelection" on InteractionInformationAtPosition? > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:1684 > - m_assistedNode = node; > if (node->hasTagName(WebCore::HTMLNames::selectTag) || node->hasTagName(WebCore::HTMLNames::inputTag) || node->hasTagName(WebCore::HTMLNames::textareaTag) || node->hasEditableStyle()) { > + m_assistedNode = node; > AssistedNodeInformation information; Should we be able to pause the video from a physical keyboard? 989677 5 226455 enrica 2014-03-12 09:59:25 -0700 Comment on attachment 226455 Patch3 View in context: https://bugs.webkit.org/attachment.cgi?id=226455&action=review >> Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:562 >> + return range->collapsed(ASSERT_NO_EXCEPTION) ? nullptr : range; > > Is this related? Not strictly to the crash, but it is part of improving the block selection experience. In some cases the created range could be collapsed and we don't want to use it for block selection (since it represents a caret selection). >> Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:1492 >> + return; > > Let's make this explicit. > > What about adding a flag "canStartSelection" on InteractionInformationAtPosition? I'll remove this for this patch. I want to make a separate patch that improves blockselection and excludes large blocks. I'll make it part of it. >> Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:1684 >> AssistedNodeInformation information; > > Should we be able to pause the video from a physical keyboard? I don't know. I will test it. I believe that if this is possible in WebKit1 it is handled at the plugin level. 989812 6 226455 benjamin 2014-03-12 13:33:38 -0700 Comment on attachment 226455 Patch3 Okay then. 989851 7 enrica 2014-03-12 16:24:22 -0700 Committed revision 165506. 226440 2014-03-11 15:59:52 -0700 2014-03-11 18:01:03 -0700 Patch videocrashonselection.txt text/plain 2792 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAkocmV2aXNpb24g MTY1NDUzKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTM0OCw3ICsxMzQ4LDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6YWRk U3VicmVzb3VyY2VMb2FkZQogCiB2b2lkIERvY3VtZW50TG9hZGVyOjpyZW1vdmVTdWJyZXNvdXJj ZUxvYWRlcihSZXNvdXJjZUxvYWRlciogbG9hZGVyKQogewotICAgIEFTU0VSVChsb2FkZXItPmlk ZW50aWZpZXIoKSk7CisvLyAgICBBU1NFUlQobG9hZGVyLT5pZGVudGlmaWVyKCkpOwogCiAgICAg aWYgKCFtX3N1YnJlc291cmNlTG9hZGVycy5yZW1vdmUobG9hZGVyLT5pZGVudGlmaWVyKCkpKQog ICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjU0NTMpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAx NC0wMy0xMSAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgorCisgICAgICAgIFtp T1MgV2ViS2l0Ml0gQ3Jhc2ggd2hlbiB0cnlpbmcgdG8gc2VsZWN0IGluc2lkZSBhIHZpZGVvIGVs ZW1lbnQgd2l0aCBsb25ncHJlc3MuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTMwMDk1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjI5NDUzND4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6Z2V0UG9zaXRpb25JbmZvcm1hdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmVs ZW1lbnREaWRGb2N1cyk6CisKIDIwMTQtMDMtMTEgIEphZSBIeXVuIFBhcmsgIDxqYWVwYXJrQHdl YmtpdC5vcmc+CiAKICAgICAgICAgW0dUS11bQ01ha2VdIEFkZCBIQVJGQlVaWl9JTkNMVURFX0RJ UlMgdG8gV2ViS2l0IGFuZCBXZWJLaXQyCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCShyZXZpc2lvbiAxNjU0NTMpCisr KyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHdv cmtpbmcgY29weSkKQEAgLTE0ODgsNiArMTQ4OCw4IEBAIHZvaWQgV2ViUGFnZTo6Z2V0UG9zaXRp b25JbmZvcm1hdGlvbihjb24KICAgICBpZiAoIWVsZW1lbnRJc0xpbmtPckltYWdlKSB7CiAgICAg ICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0ID0gbV9wYWdlLT5tYWluRnJhbWUoKS5ldmVudEhhbmRs ZXIoKS5oaXRUZXN0UmVzdWx0QXRQb2ludCgocG9pbnQpLCBIaXRUZXN0UmVxdWVzdDo6UmVhZE9u bHkgfCBIaXRUZXN0UmVxdWVzdDo6QWN0aXZlIHwgSGl0VGVzdFJlcXVlc3Q6OkRpc2FsbG93U2hh ZG93Q29udGVudCB8IEhpdFRlc3RSZXF1ZXN0OjpBbGxvd0NoaWxkRnJhbWVDb250ZW50KTsKICAg ICAgICAgaGl0Tm9kZSA9IHJlc3VsdC5pbm5lck5vZGUoKTsKKyAgICAgICAgaWYgKGlzSFRNTFZp ZGVvRWxlbWVudChoaXROb2RlKSB8fCBpc0hUTUxBdWRpb0VsZW1lbnQoaGl0Tm9kZSkpCisgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIC8vIEhpdCB0ZXN0IGNvdWxkIHJldHVybiBIVE1MSHRt bEVsZW1lbnQgdGhhdCBoYXMgbm8gcmVuZGVyZXIsIGlmIHRoZSBib2R5IGlzIHNtYWxsZXIgdGhh biB0aGUgZG9jdW1lbnQuCiAgICAgICAgIGlmIChoaXROb2RlICYmIGhpdE5vZGUtPnJlbmRlcmVy KCkpIHsKICAgICAgICAgICAgIG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuc2V0Rm9jdXNlZEZy YW1lKHJlc3VsdC5pbm5lck5vZGVGcmFtZSgpKTsKQEAgLTE2NzcsOCArMTY3OSw4IEBAIHZvaWQg V2ViUGFnZTo6Z2V0QXNzaXN0ZWROb2RlSW5mb3JtYXRpb24KIAogdm9pZCBXZWJQYWdlOjplbGVt ZW50RGlkRm9jdXMoV2ViQ29yZTo6Tm9kZSogbm9kZSkKIHsKLSAgICBtX2Fzc2lzdGVkTm9kZSA9 IG5vZGU7CiAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoV2ViQ29yZTo6SFRNTE5hbWVzOjpzZWxl Y3RUYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUoV2ViQ29yZTo6SFRNTE5hbWVzOjppbnB1dFRhZykg fHwgbm9kZS0+aGFzVGFnTmFtZShXZWJDb3JlOjpIVE1MTmFtZXM6OnRleHRhcmVhVGFnKSB8fCBu b2RlLT5oYXNFZGl0YWJsZVN0eWxlKCkpIHsKKyAgICAgICAgbV9hc3Npc3RlZE5vZGUgPSBub2Rl OwogICAgICAgICBBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiBpbmZvcm1hdGlvbjsKICAgICAgICAg Z2V0QXNzaXN0ZWROb2RlSW5mb3JtYXRpb24oaW5mb3JtYXRpb24pOwogICAgICAgICBzZW5kKE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0YXJ0QXNzaXN0aW5nTm9kZShpbmZvcm1hdGlvbikpOwo= 226454 2014-03-11 18:01:03 -0700 2014-03-11 18:02:49 -0700 Patch2 videocrashonselection.txt text/plain 3168 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAkocmV2aXNpb24g MTY1NDUzKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTM0OCw3ICsxMzQ4LDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6YWRk U3VicmVzb3VyY2VMb2FkZQogCiB2b2lkIERvY3VtZW50TG9hZGVyOjpyZW1vdmVTdWJyZXNvdXJj ZUxvYWRlcihSZXNvdXJjZUxvYWRlciogbG9hZGVyKQogewotICAgIEFTU0VSVChsb2FkZXItPmlk ZW50aWZpZXIoKSk7CisvLyAgICBBU1NFUlQobG9hZGVyLT5pZGVudGlmaWVyKCkpOwogCiAgICAg aWYgKCFtX3N1YnJlc291cmNlTG9hZGVycy5yZW1vdmUobG9hZGVyLT5pZGVudGlmaWVyKCkpKQog ICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjU0NTMpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAx NC0wMy0xMSAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgorCisgICAgICAgIFtp T1MgV2ViS2l0Ml0gQ3Jhc2ggd2hlbiB0cnlpbmcgdG8gc2VsZWN0IGluc2lkZSBhIHZpZGVvIGVs ZW1lbnQgd2l0aCBsb25ncHJlc3MuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTMwMDk1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjI5NDUzND4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6Z2V0UG9zaXRpb25JbmZvcm1hdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmVs ZW1lbnREaWRGb2N1cyk6CisKIDIwMTQtMDMtMTEgIEphZSBIeXVuIFBhcmsgIDxqYWVwYXJrQHdl YmtpdC5vcmc+CiAKICAgICAgICAgW0dUS11bQ01ha2VdIEFkZCBIQVJGQlVaWl9JTkNMVURFX0RJ UlMgdG8gV2ViS2l0IGFuZCBXZWJLaXQyCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCShyZXZpc2lvbiAxNjU0NTMpCisr KyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHdv cmtpbmcgY29weSkKQEAgLTU1OSw3ICs1NTksNyBAQCBQYXNzUmVmUHRyPFJhbmdlPiBXZWJQYWdl OjpyYW5nZUZvcldlYlNlCiAgICAgZmxhZ3MgPSBXS0lzQmxvY2tTZWxlY3Rpb247CiAgICAgcmFu Z2UgPSBSYW5nZTo6Y3JlYXRlKGJlc3RDaG9pY2UtPmRvY3VtZW50KCkpOwogICAgIHJhbmdlLT5z ZWxlY3ROb2RlQ29udGVudHMoYmVzdENob2ljZSwgQVNTRVJUX05PX0VYQ0VQVElPTik7Ci0gICAg cmV0dXJuIHJhbmdlOworICAgIHJldHVybiByYW5nZS0+Y29sbGFwc2VkKEFTU0VSVF9OT19FWENF UFRJT04pID8gbnVsbHB0ciA6IHJhbmdlOwogfQogCiBQYXNzUmVmUHRyPFJhbmdlPiBXZWJQYWdl OjpyYW5nZUZvckJsb2NrQXRQb2ludChjb25zdCBJbnRQb2ludCYgcG9pbnQpCkBAIC0xNDg4LDYg KzE0ODgsOCBAQCB2b2lkIFdlYlBhZ2U6OmdldFBvc2l0aW9uSW5mb3JtYXRpb24oY29uCiAgICAg aWYgKCFlbGVtZW50SXNMaW5rT3JJbWFnZSkgewogICAgICAgICBIaXRUZXN0UmVzdWx0IHJlc3Vs dCA9IG1fcGFnZS0+bWFpbkZyYW1lKCkuZXZlbnRIYW5kbGVyKCkuaGl0VGVzdFJlc3VsdEF0UG9p bnQoKHBvaW50KSwgSGl0VGVzdFJlcXVlc3Q6OlJlYWRPbmx5IHwgSGl0VGVzdFJlcXVlc3Q6OkFj dGl2ZSB8IEhpdFRlc3RSZXF1ZXN0OjpEaXNhbGxvd1NoYWRvd0NvbnRlbnQgfCBIaXRUZXN0UmVx dWVzdDo6QWxsb3dDaGlsZEZyYW1lQ29udGVudCk7CiAgICAgICAgIGhpdE5vZGUgPSByZXN1bHQu aW5uZXJOb2RlKCk7CisgICAgICAgIGlmIChpc0hUTUxWaWRlb0VsZW1lbnQoaGl0Tm9kZSkgfHwg aXNIVE1MQXVkaW9FbGVtZW50KGhpdE5vZGUpKQorICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICAvLyBIaXQgdGVzdCBjb3VsZCByZXR1cm4gSFRNTEh0bWxFbGVtZW50IHRoYXQgaGFzIG5vIHJl bmRlcmVyLCBpZiB0aGUgYm9keSBpcyBzbWFsbGVyIHRoYW4gdGhlIGRvY3VtZW50LgogICAgICAg ICBpZiAoaGl0Tm9kZSAmJiBoaXROb2RlLT5yZW5kZXJlcigpKSB7CiAgICAgICAgICAgICBtX3Bh Z2UtPmZvY3VzQ29udHJvbGxlcigpLnNldEZvY3VzZWRGcmFtZShyZXN1bHQuaW5uZXJOb2RlRnJh bWUoKSk7CkBAIC0xNjc3LDggKzE2NzksOCBAQCB2b2lkIFdlYlBhZ2U6OmdldEFzc2lzdGVkTm9k ZUluZm9ybWF0aW9uCiAKIHZvaWQgV2ViUGFnZTo6ZWxlbWVudERpZEZvY3VzKFdlYkNvcmU6Ok5v ZGUqIG5vZGUpCiB7Ci0gICAgbV9hc3Npc3RlZE5vZGUgPSBub2RlOwogICAgIGlmIChub2RlLT5o YXNUYWdOYW1lKFdlYkNvcmU6OkhUTUxOYW1lczo6c2VsZWN0VGFnKSB8fCBub2RlLT5oYXNUYWdO YW1lKFdlYkNvcmU6OkhUTUxOYW1lczo6aW5wdXRUYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUoV2Vi Q29yZTo6SFRNTE5hbWVzOjp0ZXh0YXJlYVRhZykgfHwgbm9kZS0+aGFzRWRpdGFibGVTdHlsZSgp KSB7CisgICAgICAgIG1fYXNzaXN0ZWROb2RlID0gbm9kZTsKICAgICAgICAgQXNzaXN0ZWROb2Rl SW5mb3JtYXRpb24gaW5mb3JtYXRpb247CiAgICAgICAgIGdldEFzc2lzdGVkTm9kZUluZm9ybWF0 aW9uKGluZm9ybWF0aW9uKTsKICAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpT dGFydEFzc2lzdGluZ05vZGUoaW5mb3JtYXRpb24pKTsK 226455 2014-03-11 18:02:49 -0700 2014-03-12 13:33:38 -0700 Patch3 videocrashonselection.txt text/plain 2639 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTQ1MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAzLTExICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPUyBXZWJLaXQyXSBDcmFz aCB3aGVuIHRyeWluZyB0byBzZWxlY3QgaW5zaWRlIGEgdmlkZW8gZWxlbWVudCB3aXRoIGxvbmdw cmVzcy4uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzAwOTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2Mjk0NTM0PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lv cy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnZXRQb3NpdGlvbklu Zm9ybWF0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZWxlbWVudERpZEZvY3VzKToK KwogMjAxNC0wMy0xMSAgSmFlIEh5dW4gUGFyayAgPGphZXBhcmtAd2Via2l0Lm9yZz4KIAogICAg ICAgICBbR1RLXVtDTWFrZV0gQWRkIEhBUkZCVVpaX0lOQ0xVREVfRElSUyB0byBXZWJLaXQgYW5k IFdlYktpdDIKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2Vi UGFnZUlPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW0JKHJldmlzaW9uIDE2NTQ1MykKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQkod29ya2luZyBjb3B5KQpAQCAt NTU5LDcgKzU1OSw3IEBAIFBhc3NSZWZQdHI8UmFuZ2U+IFdlYlBhZ2U6OnJhbmdlRm9yV2ViU2UK ICAgICBmbGFncyA9IFdLSXNCbG9ja1NlbGVjdGlvbjsKICAgICByYW5nZSA9IFJhbmdlOjpjcmVh dGUoYmVzdENob2ljZS0+ZG9jdW1lbnQoKSk7CiAgICAgcmFuZ2UtPnNlbGVjdE5vZGVDb250ZW50 cyhiZXN0Q2hvaWNlLCBBU1NFUlRfTk9fRVhDRVBUSU9OKTsKLSAgICByZXR1cm4gcmFuZ2U7Cisg ICAgcmV0dXJuIHJhbmdlLT5jb2xsYXBzZWQoQVNTRVJUX05PX0VYQ0VQVElPTikgPyBudWxscHRy IDogcmFuZ2U7CiB9CiAKIFBhc3NSZWZQdHI8UmFuZ2U+IFdlYlBhZ2U6OnJhbmdlRm9yQmxvY2tB dFBvaW50KGNvbnN0IEludFBvaW50JiBwb2ludCkKQEAgLTE0ODgsNiArMTQ4OCw4IEBAIHZvaWQg V2ViUGFnZTo6Z2V0UG9zaXRpb25JbmZvcm1hdGlvbihjb24KICAgICBpZiAoIWVsZW1lbnRJc0xp bmtPckltYWdlKSB7CiAgICAgICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0ID0gbV9wYWdlLT5tYWlu RnJhbWUoKS5ldmVudEhhbmRsZXIoKS5oaXRUZXN0UmVzdWx0QXRQb2ludCgocG9pbnQpLCBIaXRU ZXN0UmVxdWVzdDo6UmVhZE9ubHkgfCBIaXRUZXN0UmVxdWVzdDo6QWN0aXZlIHwgSGl0VGVzdFJl cXVlc3Q6OkRpc2FsbG93U2hhZG93Q29udGVudCB8IEhpdFRlc3RSZXF1ZXN0OjpBbGxvd0NoaWxk RnJhbWVDb250ZW50KTsKICAgICAgICAgaGl0Tm9kZSA9IHJlc3VsdC5pbm5lck5vZGUoKTsKKyAg ICAgICAgaWYgKGlzSFRNTFZpZGVvRWxlbWVudChoaXROb2RlKSB8fCBpc0hUTUxBdWRpb0VsZW1l bnQoaGl0Tm9kZSkpCisgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIC8vIEhpdCB0ZXN0IGNv dWxkIHJldHVybiBIVE1MSHRtbEVsZW1lbnQgdGhhdCBoYXMgbm8gcmVuZGVyZXIsIGlmIHRoZSBi b2R5IGlzIHNtYWxsZXIgdGhhbiB0aGUgZG9jdW1lbnQuCiAgICAgICAgIGlmIChoaXROb2RlICYm IGhpdE5vZGUtPnJlbmRlcmVyKCkpIHsKICAgICAgICAgICAgIG1fcGFnZS0+Zm9jdXNDb250cm9s bGVyKCkuc2V0Rm9jdXNlZEZyYW1lKHJlc3VsdC5pbm5lck5vZGVGcmFtZSgpKTsKQEAgLTE2Nzcs OCArMTY3OSw4IEBAIHZvaWQgV2ViUGFnZTo6Z2V0QXNzaXN0ZWROb2RlSW5mb3JtYXRpb24KIAog dm9pZCBXZWJQYWdlOjplbGVtZW50RGlkRm9jdXMoV2ViQ29yZTo6Tm9kZSogbm9kZSkKIHsKLSAg ICBtX2Fzc2lzdGVkTm9kZSA9IG5vZGU7CiAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoV2ViQ29y ZTo6SFRNTE5hbWVzOjpzZWxlY3RUYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUoV2ViQ29yZTo6SFRN TE5hbWVzOjppbnB1dFRhZykgfHwgbm9kZS0+aGFzVGFnTmFtZShXZWJDb3JlOjpIVE1MTmFtZXM6 OnRleHRhcmVhVGFnKSB8fCBub2RlLT5oYXNFZGl0YWJsZVN0eWxlKCkpIHsKKyAgICAgICAgbV9h c3Npc3RlZE5vZGUgPSBub2RlOwogICAgICAgICBBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiBpbmZv cm1hdGlvbjsKICAgICAgICAgZ2V0QXNzaXN0ZWROb2RlSW5mb3JtYXRpb24oaW5mb3JtYXRpb24p OwogICAgICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0YXJ0QXNzaXN0aW5nTm9k ZShpbmZvcm1hdGlvbikpOwo=