173659 2017-06-21 09:56:17 -0700 [iOS DnD] [WK2] Cancelling a drag interaction using the ObjC SPI causes subsequent dragging to fail 2017-06-21 19:26:12 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin commit-queue megan_gardner thorton webkit-bug-importer oldest_to_newest 1321527 0 wenson_hsieh 2017-06-21 09:56:17 -0700 <rdar://problem/32879788> 1321558 1 313533 wenson_hsieh 2017-06-21 11:03:21 -0700 Created attachment 313533 Patch 1321615 2 313533 thorton 2017-06-21 13:58:33 -0700 Comment on attachment 313533 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=313533&action=review > Source/WebKit2/ChangeLog:14 > + calling into -dragInteracton:itemsForBeginningSession: when we invoke their completion block). dragInteracton! 1321617 3 wenson_hsieh 2017-06-21 13:59:38 -0700 (In reply to Tim Horton from comment #2) > Comment on attachment 313533 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=313533&action=review > > > Source/WebKit2/ChangeLog:14 > > + calling into -dragInteracton:itemsForBeginningSession: when we invoke their completion block). > > dragInteracton! Good catch! Fixed. 1321663 4 313558 wenson_hsieh 2017-06-21 16:02:20 -0700 Created attachment 313558 Patch for landing 1321719 5 313558 commit-queue 2017-06-21 18:41:40 -0700 Comment on attachment 313558 Patch for landing Clearing flags on attachment: 313558 Committed r218672: <http://trac.webkit.org/changeset/218672> 313533 2017-06-21 11:03:21 -0700 2017-06-21 13:58:33 -0700 Patch bug-173659-20170621110320.patch text/plain 9204 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4NjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTgxMTViODY0YjQwY2Q5 YWQ1OWU3NWMwMzhlOTNjNDU3ZTI0N2QzYi4uNGRjNGJmNjNjMjQyNGRhZDI4YWY0YTM1Mjc2NTRj NzhiOTFjNTJjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTA2LTIxICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgRG5EXSBb V0syXSBDYW5jZWxsaW5nIGEgZHJhZyBpbnRlcmFjdGlvbiB1c2luZyB0aGUgT2JqQyBTUEkgY2F1 c2VzIHN1YnNlcXVlbnQgZHJhZ2dpbmcgdG8gZmFpbAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNjU5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8z Mjg3OTc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDdXJyZW50bHksIGEgZHJhZyBzZXNzaW9uIHRoYXQgZmFpbGVkIHRvIGJlZ2luIGlzIGNsZWFu ZWQgdXAgZWl0aGVyIHdoZW4gdGhlIHdlYiBwcm9jZXNzIHJlc3BvbmRzIGluCisgICAgICAgIC1b V0tDb250ZW50VmlldyBfZGlkSGFuZGxlU3RhcnREYXRhSW50ZXJhY3Rpb25SZXF1ZXN0Ol0gd2l0 aCBzdGFydGVkID0gTk8sIG9yIGlmIHN0YXJ0ZWQgaXMgWUVTLCBpbgorICAgICAgICAtZHJhZ0lu dGVyYWN0aW9uOnNlc3Npb246ZGlkRW5kV2l0aE9wZXJhdGlvbjogaW5zdGVhZC4gSG93ZXZlciwg aXQgaXMgcG9zc2libGUgdGhhdCBldmVuIHdoZW4gdGhlIHBhc3RlYm9hcmQgaGFzCisgICAgICAg IGl0ZW1zIGFuZCB0aGUgZHJhZyBoYXMgc3RhcnRlZCBpbiB0aGUgd2ViIHByb2Nlc3MsIHNvbWV0 aGluZyBpbiB0aGUgVUkgcHJvY2VzcyBtYXkgdGhlbiBjYXVzZSB0aGUgZHJhZyB0byBiZQorICAg ICAgICBjYW5jZWxsZWQgKGZvciBpbnN0YW5jZSwgYW4gU1BJIGNsaWVudCByZXR1cm5pbmcgZW1w dHkgYXJyYXlzIGZvciBhbGwgYWRqdXN0ZWQgaXRlbSBwcm92aWRlcnMsIG9yIFVJS2l0IG5vdCBl dmVuCisgICAgICAgIGNhbGxpbmcgaW50byAtZHJhZ0ludGVyYWN0b246aXRlbXNGb3JCZWdpbm5p bmdTZXNzaW9uOiB3aGVuIHdlIGludm9rZSB0aGVpciBjb21wbGV0aW9uIGJsb2NrKS4KKworICAg ICAgICBJbiBhbnkgY2FzZSwgaWYgdGhlIGRyYWcgc2Vzc2lvbiBpcyBkcmFnLWl0ZW0tbGVzcyBh ZnRlciBjYWxsaW5nIHRoZSBkcmFnIHN0YXJ0IGNvbXBsZXRpb24gYmxvY2ssIGNsZWFuIHVwIGFu ZAorICAgICAgICBjYW5jZWwgdGhlIGRyYWcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZGlk SGFuZGxlU3RhcnREYXRhSW50ZXJhY3Rpb25SZXF1ZXN0Ol0pOgorICAgICAgICAoLVtXS0NvbnRl bnRWaWV3IGRyYWdJbnRlcmFjdGlvbjppdGVtc0ZvckJlZ2lubmluZ1Nlc3Npb246XSk6CisKIDIw MTctMDYtMjAgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAg ICAgICBEaXNhYmxlIGZvbnQgdmFyaWF0aW9ucyBvbiBtYWNPUyBTaWVycmEgYW5kIGlPUyAxMApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbQppbmRleCBjYTMxMzI0MjBiNTgyN2YzMTc1MmQwMWEzNDUxYmFlY2MzYmU2 MjIwLi42YTM0YzFiNDcyZWU1NzcxNmYyYTE4NmM5NzA5Yjc5ZjJjMDE3Y2IxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbQpAQCAtNDIzMiwxNSArNDIzMiwxOCBAQCAtICh2b2lkKV9kaWRIYW5kbGVTdGFydERh dGFJbnRlcmFjdGlvblJlcXVlc3Q6KEJPT0wpc3RhcnRlZAogICAgIF9kYXRhSW50ZXJhY3Rpb25T dGF0ZS5kcmFnU3RhcnRDb21wbGV0aW9uQmxvY2sgPSBuaWw7CiAgICAgQVNTRVJUKHNhdmVkQ29t cGxldGlvbkJsb2NrKTsKIAotICAgIGlmICghc3RhcnRlZCkgewotICAgICAgICAvLyBUaGUgd2Vi IHByb2Nlc3MgcmVqZWN0ZWQgdGhlIGRyYWcgc3RhcnQgcmVxdWVzdCwgc28gZG9uJ3QgZ28gdGhy b3VnaCB3aXRoIHRoZSBkcmFnLgotICAgICAgICAvLyBCeSBjbGVhcmluZyBvdXQgdGhlIHNvdXJj ZSBzZXNzaW9uIHN0YXRlLCB3ZSBmb3JjZSAtaXRlbXNGb3JEcmFnSW50ZXJhY3Rpb246c2Vzc2lv bjogdG8gcmV0dXJuIGFuIGVtcHR5IGFycmF5LCB3aGljaAotICAgICAgICAvLyBjYXVzZXMgVUlL aXQgdG8gYmFpbCBiZWZvcmUgYmVnaW5uaW5nIHRoZSBsaWZ0IGFuaW1hdGlvbi4KLSAgICAgICAg W3NlbGYgY2xlYW5VcERyYWdTb3VyY2VTZXNzaW9uU3RhdGVdOwotICAgIH0KLQogICAgIGlmIChz YXZlZENvbXBsZXRpb25CbG9jaykKICAgICAgICAgc2F2ZWRDb21wbGV0aW9uQmxvY2soKTsKKwor ICAgIGlmICghW19kYXRhSW50ZXJhY3Rpb25TdGF0ZS5kcmFnU2Vzc2lvbiBpdGVtc10uY291bnQp IHsKKyAgICAgICAgQ0dQb2ludCBhZGp1c3RlZE9yaWdpbiA9IF9kYXRhSW50ZXJhY3Rpb25TdGF0 ZS5hZGp1c3RlZE9yaWdpbjsKKyAgICAgICAgW3NlbGYgY2xlYW5VcERyYWdTb3VyY2VTZXNzaW9u U3RhdGVdOworICAgICAgICBpZiAoc3RhcnRlZCkgeworICAgICAgICAgICAgLy8gQSBjbGllbnQg b2YgdGhlIE9iamVjdGl2ZSBDIFNQSSBvciBVSUtpdCBtaWdodCBoYXZlIHByZXZlbnRlZCB0aGUg ZHJhZyBmcm9tIGJlZ2lubmluZyBlbnRpcmVseSBpbiB0aGUgVUkgcHJvY2VzcywgaW4gd2hpY2gg Y2FzZQorICAgICAgICAgICAgLy8gd2UgbmVlZCB0byBiYWxhbmNlIHRoZSBgZHJhZ3N0YXJ0YCBl dmVudCB3aXRoIGEgYGRyYWdlbmRgLgorICAgICAgICAgICAgX3BhZ2UtPmRyYWdFbmRlZChyb3Vu ZGVkSW50UG9pbnQoYWRqdXN0ZWRPcmlnaW4pLCByb3VuZGVkSW50UG9pbnQoW3NlbGYgY29udmVy dFBvaW50OmFkanVzdGVkT3JpZ2luIHRvVmlldzpzZWxmLndpbmRvd10pLCBEcmFnT3BlcmF0aW9u Tm9uZSk7CisgICAgICAgIH0KKyAgICB9CiB9CiAKIHN0YXRpYyBSZXRhaW5QdHI8VUlJbWFnZT4g dWlJbWFnZUZvckltYWdlKFJlZlB0cjxJbWFnZT4gaW1hZ2UpCkBAIC00NTM5LDYgKzQ1NDIsOSBA QCAtIChOU0FycmF5PFVJRHJhZ0l0ZW0gKj4gKilkcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVy YWN0aW9uICopaW50ZXJhY3Rpb24gaXRlbQogICAgIGlmIChfZGF0YUludGVyYWN0aW9uU3RhdGUu ZHJhZ1Nlc3Npb24gIT0gc2Vzc2lvbikKICAgICAgICAgcmV0dXJuIEBbIF07CiAKKyAgICBpZiAo X2RhdGFJbnRlcmFjdGlvblN0YXRlLnNvdXJjZUFjdGlvbiA9PSBEcmFnU291cmNlQWN0aW9uTm9u ZSkKKyAgICAgICAgcmV0dXJuIEBbIF07CisKICAgICBXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJk ICpkcmFnZ2luZ1Bhc3RlYm9hcmQgPSBbV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZCBzaGFyZWRJ bnN0YW5jZV07CiAgICAgQVNTRVJUKGludGVyYWN0aW9uID09IF9kYXRhSW50ZXJhY3Rpb24pOwog ICAgIE5TVUludGVnZXIgbnVtYmVyT2ZJdGVtcyA9IGRyYWdnaW5nUGFzdGVib2FyZC5udW1iZXJP Zkl0ZW1zOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IDIzOWIzZjkyODg4N2U4ODRmZTBjZTk4MGQxY2NmZGE3N2MxOGZmODUuLjYwNDFkMDU1ZTdh ZTk1YmQ0ODljZDY4ODZlOTk0Y2RmOGY2MjFlMzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxNy0wNi0yMSAgV2Vu c29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TIERuRF0g W1dLMl0gQ2FuY2VsbGluZyBhIGRyYWcgaW50ZXJhY3Rpb24gdXNpbmcgdGhlIE9iakMgU1BJIGNh dXNlcyBzdWJzZXF1ZW50IGRyYWdnaW5nIHRvIGZhaWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzY1OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MzI4Nzk3ODg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkcyBhIG5ldyB0ZXN0IHRvIHZlcmlmeSB0aGF0IGEgbGlmdCBjYW5jZWxsZWQgd2l0aGlu IHRoZSBVSSBwcm9jZXNzIGRvZXMgbm90IGNhdXNlIHN1YnNlcXVlbnQgZHJhZ2dpbmcgdG8gZmFp bC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL2xpbmstYW5k LXRhcmdldC1kaXYuaHRtbDoKKworICAgICAgICBBdWdtZW50IHRoaXMgdGVzdCBwYWdlIHRvIGxv ZyBkcmFnZW5kIGFuZCBkcmFnc3RhcnQgZXZlbnRzIG9uIHRoZSBkcmFnIHNvdXJjZSBhcyB3ZWxs LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvRGF0YUludGVyYWN0aW9uVGVz dHMubW06CisgICAgICAgIChjaGVja1N0cmluZ0FycmF5c0FyZUVxdWFsKToKKyAgICAgICAgKFRl c3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDE3LTA2LTIwICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1t YXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgRGlzYWJsZSBmb250IHZhcmlhdGlvbnMgb24g bWFjT1MgU2llcnJhIGFuZCBpT1MgMTAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0MkNvY29hL2xpbmstYW5kLXRhcmdldC1kaXYuaHRtbCBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL2xpbmstYW5kLXRhcmdldC1kaXYuaHRtbAppbmRl eCA2ZmFkNjY5MWFjMTE4NzIzMjdkZGUyMDFjZjFlOGI5NGU5MWYwZTU3Li4zNTI5NGM2NGFmNDM3 ODg4NzU4MjEzOGNiZjJkNGY2YzU1MDM5YjNmIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9saW5rLWFuZC10YXJnZXQtZGl2Lmh0bWwKKysrIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvbGluay1hbmQtdGFyZ2V0LWRpdi5o dG1sCkBAIC0yMSwxMyArMjEsMjIgQEAgY29kZSB7CiAgICAgY29sb3I6IGdyZWVuOwogfQogPC9z dHlsZT4KLTxkaXY+PGEgaHJlZj0iaHR0cHM6Ly93d3cuYXBwbGUuY29tIj5IZWxsbyB3b3JsZDwv YT48L2Rpdj4KKzxkaXY+PGEgaWQ9InNvdXJjZSIgaHJlZj0iaHR0cHM6Ly93d3cuYXBwbGUuY29t Ij5IZWxsbyB3b3JsZDwvYT48L2Rpdj4KIDxkaXYgaWQ9InRhcmdldCI+PC9kaXY+Cis8ZGl2IGlk PSJvdXRwdXQiPjwvZGl2PgogPHNjcmlwdD4KK3NvdXJjZS5hZGRFdmVudExpc3RlbmVyKCJkcmFn c3RhcnQiLCBldmVudCA9PiBsb2dPdXRwdXQoImRyYWdzdGFydCIpKTsKK3NvdXJjZS5hZGRFdmVu dExpc3RlbmVyKCJkcmFnZW5kIiwgZXZlbnQgPT4gbG9nT3V0cHV0KCJkcmFnZW5kIikpOwogdGFy Z2V0LmFkZEV2ZW50TGlzdGVuZXIoImRyYWdlbnRlciIsIGV2ZW50ID0+IGV2ZW50LnByZXZlbnRE ZWZhdWx0KCkpOwogdGFyZ2V0LmFkZEV2ZW50TGlzdGVuZXIoImRyYWdvdmVyIiwgZXZlbnQgPT4g ZXZlbnQucHJldmVudERlZmF1bHQoKSk7CiB0YXJnZXQuYWRkRXZlbnRMaXN0ZW5lcigiZHJvcCIs IGV2ZW50ID0+IHsKICAgICB0YXJnZXQuaW5uZXJIVE1MID0gIjxjb2RlPlBBU1M8L2NvZGU+IjsK ICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogfSk7CitmdW5jdGlvbiBsb2dPdXRwdXQobWVz c2FnZSkKK3sKKyAgICBpZiAob3V0cHV0LmlubmVySFRNTC5sZW5ndGgpCisgICAgICAgIG1lc3Nh Z2UgPSBgICR7bWVzc2FnZX1gOworICAgIG91dHB1dC5pbnNlcnRBZGphY2VudEhUTUwoImJlZm9y ZWVuZCIsIGA8Y29kZT4ke21lc3NhZ2V9PC9jb2RlPmApOworfQogPC9zY3JpcHQ+CmRpZmYgLS1n aXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9EYXRhSW50ZXJhY3Rpb25UZXN0cy5t bSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL0RhdGFJbnRlcmFjdGlvblRlc3RzLm1t CmluZGV4IGIzNjZlYjU1YjgzZGNjODE1YzU2MjQzNWE2YjhiY2M1NmZjMWI1NTQuLjc2YWZiODk4 ZDRmNDZmMzdmMDdmMzU1YWQwNGU1ZTA1NTliYzU4MzEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvaW9zL0RhdGFJbnRlcmFjdGlvblRlc3RzLm1tCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvaW9zL0RhdGFJbnRlcmFjdGlvblRlc3RzLm1tCkBAIC0xMjAsNiAr MTIwLDE4IEBAIHN0YXRpYyB2b2lkIGNoZWNrU3VnZ2VzdGVkTmFtZUFuZEVzdGltYXRlZFNpemUo RGF0YUludGVyYWN0aW9uU2ltdWxhdG9yICpzaW11bGF0CiAgICAgRVhQRUNUX0VRKGVzdGltYXRl ZFNpemUuaGVpZ2h0LCBzb3VyY2VJdGVtUHJvdmlkZXIuZXN0aW1hdGVkRGlzcGxheWVkU2l6ZS5o ZWlnaHQpOwogfQogCitzdGF0aWMgdm9pZCBjaGVja1N0cmluZ0FycmF5c0FyZUVxdWFsKE5TQXJy YXk8TlNTdHJpbmcgKj4gKmV4cGVjdGVkLCBOU0FycmF5PE5TU3RyaW5nICo+ICpvYnNlcnZlZCkK K3sKKyAgICBFWFBFQ1RfRVEoZXhwZWN0ZWQuY291bnQsIG9ic2VydmVkLmNvdW50KTsKKyAgICBm b3IgKE5TVUludGVnZXIgaW5kZXggPSAwOyBpbmRleCA8IGV4cGVjdGVkLmNvdW50OyArK2luZGV4 KSB7CisgICAgICAgIE5TU3RyaW5nICpleHBlY3RlZFN0cmluZyA9IFtleHBlY3RlZCBvYmplY3RB dEluZGV4OmluZGV4XTsKKyAgICAgICAgTlNTdHJpbmcgKm9ic2VydmVkU3RyaW5nID0gW29ic2Vy dmVkIG9iamVjdEF0SW5kZXg6aW5kZXhdOworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoZXhwZWN0 ZWRTdHJpbmcsIG9ic2VydmVkU3RyaW5nKTsKKyAgICAgICAgaWYgKCFbZXhwZWN0ZWRTdHJpbmcg aXNFcXVhbFRvU3RyaW5nOm9ic2VydmVkU3RyaW5nXSkKKyAgICAgICAgICAgIE5TTG9nKEAiRXhw ZWN0ZWQgb2JzZXJ2ZWQgc3RyaW5nOiAlQCB0byBtYXRjaCBleHBlY3RlZCBzdHJpbmc6ICVAIGF0 IGluZGV4OiAldHUiLCBvYnNlcnZlZFN0cmluZywgZXhwZWN0ZWRTdHJpbmcsIGluZGV4KTsKKyAg ICB9Cit9CisKIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKIAogVEVTVChEYXRhSW50ZXJhY3Rp b25UZXN0cywgSW1hZ2VUb0NvbnRlbnRFZGl0YWJsZSkKQEAgLTkyOSw2ICs5NDEsMzMgQEAgVEVT VChEYXRhSW50ZXJhY3Rpb25UZXN0cywgTGlua1dpdGhFbXB0eUhSRUYpCiAgICAgRVhQRUNUX1dL X1NUUkVRKCIiLCBbd2ViVmlldyBlZGl0b3JWYWx1ZV0uVVRGOFN0cmluZyk7CiB9CiAKK1RFU1Qo RGF0YUludGVyYWN0aW9uVGVzdHMsIENhbmNlbGxlZExpZnREb2VzTm90Q2F1c2VTdWJzZXF1ZW50 RHJhZ3NUb0ZhaWwpCit7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZp ZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAzMjAsIDUwMCldKTsKKyAg ICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdlTmFtZWQ6QCJsaW5rLWFuZC10YXJn ZXQtZGl2Il07CisKKyAgICBhdXRvIGRhdGFJbnRlcmFjdGlvblNpbXVsYXRvciA9IGFkb3B0TlMo W1tEYXRhSW50ZXJhY3Rpb25TaW11bGF0b3IgYWxsb2NdIGluaXRXaXRoV2ViVmlldzp3ZWJWaWV3 LmdldCgpXSk7CisgICAgW2RhdGFJbnRlcmFjdGlvblNpbXVsYXRvciBzZXRDb252ZXJ0SXRlbVBy b3ZpZGVyc0Jsb2NrOl5OU0FycmF5ICooVUlJdGVtUHJvdmlkZXIgKiwgTlNBcnJheSAqLCBOU0Rp Y3Rpb25hcnkgKikKKyAgICB7CisgICAgICAgIHJldHVybiBAWyBdOworICAgIH1dOworICAgIFtk YXRhSW50ZXJhY3Rpb25TaW11bGF0b3IgcnVuRnJvbTpDR1BvaW50TWFrZSgxMDAsIDUwKSB0bzpD R1BvaW50TWFrZSgxMDAsIDMwMCldOworICAgIEVYUEVDVF9FUShEYXRhSW50ZXJhY3Rpb25DYW5j ZWxsZWQsIFtkYXRhSW50ZXJhY3Rpb25TaW11bGF0b3IgcGhhc2VdKTsKKyAgICBFWFBFQ1RfV0tf U1RSRVEoIiIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJ0YXJnZXQu dGV4dENvbnRlbnQiXSk7CisgICAgTlNTdHJpbmcgKm91dHB1dFRleHQgPSBbd2ViVmlldyBzdHJp bmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAib3V0cHV0LnRleHRDb250ZW50Il07CisgICAgY2hl Y2tTdHJpbmdBcnJheXNBcmVFcXVhbChAW0AiZHJhZ3N0YXJ0IiwgQCJkcmFnZW5kIl0sIFtvdXRw dXRUZXh0IGNvbXBvbmVudHNTZXBhcmF0ZWRCeVN0cmluZzpAIiAiXSk7CisKKyAgICBbd2ViVmll dyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAib3V0cHV0LmlubmVySFRNTCA9ICcnIl07 CisgICAgW2RhdGFJbnRlcmFjdGlvblNpbXVsYXRvciBzZXRDb252ZXJ0SXRlbVByb3ZpZGVyc0Js b2NrOl5OU0FycmF5ICooVUlJdGVtUHJvdmlkZXIgKml0ZW1Qcm92aWRlciwgTlNBcnJheSAqLCBO U0RpY3Rpb25hcnkgKikKKyAgICB7CisgICAgICAgIHJldHVybiBAWyBpdGVtUHJvdmlkZXIgXTsK KyAgICB9XTsKKyAgICBbZGF0YUludGVyYWN0aW9uU2ltdWxhdG9yIHJ1bkZyb206Q0dQb2ludE1h a2UoMTAwLCA1MCkgdG86Q0dQb2ludE1ha2UoMTAwLCAzMDApXTsKKyAgICBFWFBFQ1RfV0tfU1RS RVEoIlBBU1MiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAidGFyZ2V0 LnRleHRDb250ZW50Il0pOworICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3Jp cHQ6QCJvdXRwdXQudGV4dENvbnRlbnQiXTsKKyAgICBjaGVja1N0cmluZ0FycmF5c0FyZUVxdWFs KEBbQCJkcmFnc3RhcnQiLCBAImRyYWdlbmQiXSwgW291dHB1dFRleHQgY29tcG9uZW50c1NlcGFy YXRlZEJ5U3RyaW5nOkAiICJdKTsKK30KKwogVEVTVChEYXRhSW50ZXJhY3Rpb25UZXN0cywgQ3Vz dG9tQWN0aW9uU2hlZXRQb3BvdmVyKQogewogICAgIFJldGFpblB0cjxUZXN0V0tXZWJWaWV3PiB3 ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dS ZWN0TWFrZSgwLCAwLCAzMjAsIDUwMCldKTsK 313558 2017-06-21 16:02:20 -0700 2017-06-21 18:41:40 -0700 Patch for landing bug-173659-20170621160219.patch text/plain 9416 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4NjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTZjOTQ0YTM5NGMwNDAy NDdlM2E1NWVjY2VhYTY4MGVmNzljMjI3OS4uMDhhZTBkOTNiNmIzOWJlMmE3NjM2NjRhZTgxYzgz OGVmY2QyOTBmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTA2LTIxICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgRG5EXSBb V0syXSBDYW5jZWxsaW5nIGEgZHJhZyBpbnRlcmFjdGlvbiB1c2luZyB0aGUgT2JqQyBTUEkgY2F1 c2VzIHN1YnNlcXVlbnQgZHJhZ2dpbmcgdG8gZmFpbAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNjU5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8z Mjg3OTc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEN1 cnJlbnRseSwgYSBkcmFnIHNlc3Npb24gdGhhdCBmYWlsZWQgdG8gYmVnaW4gaXMgY2xlYW5lZCB1 cCBlaXRoZXIgd2hlbiB0aGUgd2ViIHByb2Nlc3MgcmVzcG9uZHMgaW4KKyAgICAgICAgLVtXS0Nv bnRlbnRWaWV3IF9kaWRIYW5kbGVTdGFydERhdGFJbnRlcmFjdGlvblJlcXVlc3Q6XSB3aXRoIHN0 YXJ0ZWQgPSBOTywgb3IgaWYgc3RhcnRlZCBpcyBZRVMsIGluCisgICAgICAgIC1kcmFnSW50ZXJh Y3Rpb246c2Vzc2lvbjpkaWRFbmRXaXRoT3BlcmF0aW9uOiBpbnN0ZWFkLiBIb3dldmVyLCBpdCBp cyBwb3NzaWJsZSB0aGF0IGV2ZW4gd2hlbiB0aGUgcGFzdGVib2FyZCBoYXMKKyAgICAgICAgaXRl bXMgYW5kIHRoZSBkcmFnIGhhcyBzdGFydGVkIGluIHRoZSB3ZWIgcHJvY2Vzcywgc29tZXRoaW5n IGluIHRoZSBVSSBwcm9jZXNzIG1heSB0aGVuIGNhdXNlIHRoZSBkcmFnIHRvIGJlCisgICAgICAg IGNhbmNlbGxlZCAoZm9yIGluc3RhbmNlLCBhbiBTUEkgY2xpZW50IHJldHVybmluZyBlbXB0eSBh cnJheXMgZm9yIGFsbCBhZGp1c3RlZCBpdGVtIHByb3ZpZGVycywgb3IgVUlLaXQgbm90IGV2ZW4K KyAgICAgICAgY2FsbGluZyBpbnRvIC1kcmFnSW50ZXJhY3Rpb246aXRlbXNGb3JCZWdpbm5pbmdT ZXNzaW9uOiB3aGVuIHdlIGludm9rZSB0aGVpciBjb21wbGV0aW9uIGJsb2NrKS4KKworICAgICAg ICBJbiBhbnkgY2FzZSwgaWYgdGhlIGRyYWcgc2Vzc2lvbiBpcyBkcmFnLWl0ZW0tbGVzcyBhZnRl ciBjYWxsaW5nIHRoZSBkcmFnIHN0YXJ0IGNvbXBsZXRpb24gYmxvY2ssIGNsZWFuIHVwIGFuZAor ICAgICAgICBjYW5jZWwgdGhlIGRyYWcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZGlkSGFu ZGxlU3RhcnREYXRhSW50ZXJhY3Rpb25SZXF1ZXN0Ol0pOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IGRyYWdJbnRlcmFjdGlvbjppdGVtc0ZvckJlZ2lubmluZ1Nlc3Npb246XSk6CisKIDIwMTct MDYtMjEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAg UkVHUkVTU0lPTiAocjIxODYwNik6IDNEIFRvdWNoIGFjdGlvbiBtZW51IGZvciBsaW5rcyBpcyBt aXNzaW5nIGl0ZW1zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDBiY2I2MTc1MDNkYWY5ZTRjMGRjZDYx OGMzZjc3YTM0NjQwMDI5ODYuLjM0MjZmMTQ2YWVmMDJjODExNDE0ODk4MjJlMDc4OGI2MzdmZDJj ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC00MjMyLDE2ICs0MjMyLDE5IEBAIC0gKHZvaWQpX2Rp ZEhhbmRsZVN0YXJ0RGF0YUludGVyYWN0aW9uUmVxdWVzdDooQk9PTClzdGFydGVkCiAgICAgX2Rh dGFJbnRlcmFjdGlvblN0YXRlLmRyYWdTdGFydENvbXBsZXRpb25CbG9jayA9IG5pbDsKICAgICBB U1NFUlQoc2F2ZWRDb21wbGV0aW9uQmxvY2spOwogCi0gICAgaWYgKCFzdGFydGVkKSB7Ci0gICAg ICAgIC8vIFRoZSB3ZWIgcHJvY2VzcyByZWplY3RlZCB0aGUgZHJhZyBzdGFydCByZXF1ZXN0LCBz byBkb24ndCBnbyB0aHJvdWdoIHdpdGggdGhlIGRyYWcuCi0gICAgICAgIC8vIEJ5IGNsZWFyaW5n IG91dCB0aGUgc291cmNlIHNlc3Npb24gc3RhdGUsIHdlIGZvcmNlIC1pdGVtc0ZvckRyYWdJbnRl cmFjdGlvbjpzZXNzaW9uOiB0byByZXR1cm4gYW4gZW1wdHkgYXJyYXksIHdoaWNoCi0gICAgICAg IC8vIGNhdXNlcyBVSUtpdCB0byBiYWlsIGJlZm9yZSBiZWdpbm5pbmcgdGhlIGxpZnQgYW5pbWF0 aW9uLgotICAgICAgICBbc2VsZiBjbGVhblVwRHJhZ1NvdXJjZVNlc3Npb25TdGF0ZV07Ci0gICAg fQotCiAgICAgUkVMRUFTRV9MT0coRHJhZ0FuZERyb3AsICJIYW5kbGluZyBkcmFnIHN0YXJ0IHJl cXVlc3QgKHN0YXJ0ZWQ6ICVkLCBjb21wbGV0aW9uIGJsb2NrOiAlcCkiLCBzdGFydGVkLCBzYXZl ZENvbXBsZXRpb25CbG9jay5nZXQoKSk7CiAgICAgaWYgKHNhdmVkQ29tcGxldGlvbkJsb2NrKQog ICAgICAgICBzYXZlZENvbXBsZXRpb25CbG9jaygpOworCisgICAgaWYgKCFbX2RhdGFJbnRlcmFj dGlvblN0YXRlLmRyYWdTZXNzaW9uIGl0ZW1zXS5jb3VudCkgeworICAgICAgICBDR1BvaW50IGFk anVzdGVkT3JpZ2luID0gX2RhdGFJbnRlcmFjdGlvblN0YXRlLmFkanVzdGVkT3JpZ2luOworICAg ICAgICBbc2VsZiBjbGVhblVwRHJhZ1NvdXJjZVNlc3Npb25TdGF0ZV07CisgICAgICAgIGlmIChz dGFydGVkKSB7CisgICAgICAgICAgICAvLyBBIGNsaWVudCBvZiB0aGUgT2JqZWN0aXZlIEMgU1BJ IG9yIFVJS2l0IG1pZ2h0IGhhdmUgcHJldmVudGVkIHRoZSBkcmFnIGZyb20gYmVnaW5uaW5nIGVu dGlyZWx5IGluIHRoZSBVSSBwcm9jZXNzLCBpbiB3aGljaCBjYXNlCisgICAgICAgICAgICAvLyB3 ZSBuZWVkIHRvIGJhbGFuY2UgdGhlIGBkcmFnc3RhcnRgIGV2ZW50IHdpdGggYSBgZHJhZ2VuZGAu CisgICAgICAgICAgICBfcGFnZS0+ZHJhZ0VuZGVkKHJvdW5kZWRJbnRQb2ludChhZGp1c3RlZE9y aWdpbiksIHJvdW5kZWRJbnRQb2ludChbc2VsZiBjb252ZXJ0UG9pbnQ6YWRqdXN0ZWRPcmlnaW4g dG9WaWV3OnNlbGYud2luZG93XSksIERyYWdPcGVyYXRpb25Ob25lKTsKKyAgICAgICAgfQorICAg IH0KIH0KIAogc3RhdGljIFJldGFpblB0cjxVSUltYWdlPiB1aUltYWdlRm9ySW1hZ2UoUmVmUHRy PEltYWdlPiBpbWFnZSkKQEAgLTQ1NTEsNiArNDU1NCwxMSBAQCAtIChOU0FycmF5PFVJRHJhZ0l0 ZW0gKj4gKilkcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJhY3Rpb24g aXRlbQogICAgICAgICByZXR1cm4gQFsgXTsKICAgICB9CiAKKyAgICBpZiAoX2RhdGFJbnRlcmFj dGlvblN0YXRlLnNvdXJjZUFjdGlvbiA9PSBEcmFnU291cmNlQWN0aW9uTm9uZSkgeworICAgICAg ICBSRUxFQVNFX0xPRyhEcmFnQW5kRHJvcCwgIkRyYWcgc2Vzc2lvbiBmYWlsZWQ6ICVwIChubyBk cmFnIHNvdXJjZSBhY3Rpb24pIiwgc2Vzc2lvbik7CisgICAgICAgIHJldHVybiBAWyBdOworICAg IH0KKwogICAgIFdlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQgKmRyYWdnaW5nUGFzdGVib2FyZCA9 IFtXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkIHNoYXJlZEluc3RhbmNlXTsKICAgICBBU1NFUlQo aW50ZXJhY3Rpb24gPT0gX2RhdGFJbnRlcmFjdGlvbik7CiAgICAgTlNVSW50ZWdlciBudW1iZXJP Zkl0ZW1zID0gZHJhZ2dpbmdQYXN0ZWJvYXJkLm51bWJlck9mSXRlbXM7CmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODY3NjlhMDMzNjcwN2VmOGQ1 YWZkMTVmMmY1MDMwYWZjNWY2YWY5MS4uZTkxNWEwNjY1NTFhNDc0OGJhZjVlZTRhNGU3OTc1ZmQ2 NDEyNmU0NiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA2LTIxICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNp ZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgRG5EXSBbV0syXSBDYW5jZWxsaW5nIGEgZHJh ZyBpbnRlcmFjdGlvbiB1c2luZyB0aGUgT2JqQyBTUEkgY2F1c2VzIHN1YnNlcXVlbnQgZHJhZ2dp bmcgdG8gZmFpbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTczNjU5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjg3OTc4OD4KKworICAgICAgICBS ZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEFkZHMgYSBuZXcgdGVzdCB0byB2ZXJp ZnkgdGhhdCBhIGxpZnQgY2FuY2VsbGVkIHdpdGhpbiB0aGUgVUkgcHJvY2VzcyBkb2VzIG5vdCBj YXVzZSBzdWJzZXF1ZW50IGRyYWdnaW5nIHRvIGZhaWwuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9saW5rLWFuZC10YXJnZXQtZGl2Lmh0bWw6CisKKyAgICAg ICAgQXVnbWVudCB0aGlzIHRlc3QgcGFnZSB0byBsb2cgZHJhZ2VuZCBhbmQgZHJhZ3N0YXJ0IGV2 ZW50cyBvbiB0aGUgZHJhZyBzb3VyY2UgYXMgd2VsbC4KKworICAgICAgICAqIFRlc3RXZWJLaXRB UEkvVGVzdHMvaW9zL0RhdGFJbnRlcmFjdGlvblRlc3RzLm1tOgorICAgICAgICAoY2hlY2tTdHJp bmdBcnJheXNBcmVFcXVhbCk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAx Ny0wNi0yMSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIEFk ZCBsb2dnaW5nIHRvIGlkZW50aWZ5IHdoZW4gdGhlIFBhZ2Ugc3VzcGVuZHMgc2NyaXB0ZWQgYW5p bWF0aW9ucwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29j b2EvbGluay1hbmQtdGFyZ2V0LWRpdi5odG1sIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQyQ29jb2EvbGluay1hbmQtdGFyZ2V0LWRpdi5odG1sCmluZGV4IDZmYWQ2NjkxYWMxMTg3 MjMyN2RkZTIwMWNmMWU4Yjk0ZTkxZjBlNTcuLjM1Mjk0YzY0YWY0Mzc4ODg3NTgyMTM4Y2JmMmQ0 ZjZjNTUwMzliM2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 MkNvY29hL2xpbmstYW5kLXRhcmdldC1kaXYuaHRtbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdDJDb2NvYS9saW5rLWFuZC10YXJnZXQtZGl2Lmh0bWwKQEAgLTIxLDEzICsy MSwyMiBAQCBjb2RlIHsKICAgICBjb2xvcjogZ3JlZW47CiB9CiA8L3N0eWxlPgotPGRpdj48YSBo cmVmPSJodHRwczovL3d3dy5hcHBsZS5jb20iPkhlbGxvIHdvcmxkPC9hPjwvZGl2PgorPGRpdj48 YSBpZD0ic291cmNlIiBocmVmPSJodHRwczovL3d3dy5hcHBsZS5jb20iPkhlbGxvIHdvcmxkPC9h PjwvZGl2PgogPGRpdiBpZD0idGFyZ2V0Ij48L2Rpdj4KKzxkaXYgaWQ9Im91dHB1dCI+PC9kaXY+ CiA8c2NyaXB0Pgorc291cmNlLmFkZEV2ZW50TGlzdGVuZXIoImRyYWdzdGFydCIsIGV2ZW50ID0+ IGxvZ091dHB1dCgiZHJhZ3N0YXJ0IikpOworc291cmNlLmFkZEV2ZW50TGlzdGVuZXIoImRyYWdl bmQiLCBldmVudCA9PiBsb2dPdXRwdXQoImRyYWdlbmQiKSk7CiB0YXJnZXQuYWRkRXZlbnRMaXN0 ZW5lcigiZHJhZ2VudGVyIiwgZXZlbnQgPT4gZXZlbnQucHJldmVudERlZmF1bHQoKSk7CiB0YXJn ZXQuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ292ZXIiLCBldmVudCA9PiBldmVudC5wcmV2ZW50RGVm YXVsdCgpKTsKIHRhcmdldC5hZGRFdmVudExpc3RlbmVyKCJkcm9wIiwgZXZlbnQgPT4gewogICAg IHRhcmdldC5pbm5lckhUTUwgPSAiPGNvZGU+UEFTUzwvY29kZT4iOwogICAgIGV2ZW50LnByZXZl bnREZWZhdWx0KCk7CiB9KTsKK2Z1bmN0aW9uIGxvZ091dHB1dChtZXNzYWdlKQoreworICAgIGlm IChvdXRwdXQuaW5uZXJIVE1MLmxlbmd0aCkKKyAgICAgICAgbWVzc2FnZSA9IGAgJHttZXNzYWdl fWA7CisgICAgb3V0cHV0Lmluc2VydEFkamFjZW50SFRNTCgiYmVmb3JlZW5kIiwgYDxjb2RlPiR7 bWVzc2FnZX08L2NvZGU+YCk7Cit9CiA8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvaW9zL0RhdGFJbnRlcmFjdGlvblRlc3RzLm1tIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9pb3MvRGF0YUludGVyYWN0aW9uVGVzdHMubW0KaW5kZXggYjM2NmViNTVi ODNkY2M4MTVjNTYyNDM1YTZiOGJjYzU2ZmMxYjU1NC4uNzZhZmI4OThkNGY0NmYzN2YwN2YzNTVh ZDA0ZTVlMDU1OWJjNTgzMSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9p b3MvRGF0YUludGVyYWN0aW9uVGVzdHMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9pb3MvRGF0YUludGVyYWN0aW9uVGVzdHMubW0KQEAgLTEyMCw2ICsxMjAsMTggQEAgc3RhdGlj IHZvaWQgY2hlY2tTdWdnZXN0ZWROYW1lQW5kRXN0aW1hdGVkU2l6ZShEYXRhSW50ZXJhY3Rpb25T aW11bGF0b3IgKnNpbXVsYXQKICAgICBFWFBFQ1RfRVEoZXN0aW1hdGVkU2l6ZS5oZWlnaHQsIHNv dXJjZUl0ZW1Qcm92aWRlci5lc3RpbWF0ZWREaXNwbGF5ZWRTaXplLmhlaWdodCk7CiB9CiAKK3N0 YXRpYyB2b2lkIGNoZWNrU3RyaW5nQXJyYXlzQXJlRXF1YWwoTlNBcnJheTxOU1N0cmluZyAqPiAq ZXhwZWN0ZWQsIE5TQXJyYXk8TlNTdHJpbmcgKj4gKm9ic2VydmVkKQoreworICAgIEVYUEVDVF9F UShleHBlY3RlZC5jb3VudCwgb2JzZXJ2ZWQuY291bnQpOworICAgIGZvciAoTlNVSW50ZWdlciBp bmRleCA9IDA7IGluZGV4IDwgZXhwZWN0ZWQuY291bnQ7ICsraW5kZXgpIHsKKyAgICAgICAgTlNT dHJpbmcgKmV4cGVjdGVkU3RyaW5nID0gW2V4cGVjdGVkIG9iamVjdEF0SW5kZXg6aW5kZXhdOwor ICAgICAgICBOU1N0cmluZyAqb2JzZXJ2ZWRTdHJpbmcgPSBbb2JzZXJ2ZWQgb2JqZWN0QXRJbmRl eDppbmRleF07CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShleHBlY3RlZFN0cmluZywgb2JzZXJ2 ZWRTdHJpbmcpOworICAgICAgICBpZiAoIVtleHBlY3RlZFN0cmluZyBpc0VxdWFsVG9TdHJpbmc6 b2JzZXJ2ZWRTdHJpbmddKQorICAgICAgICAgICAgTlNMb2coQCJFeHBlY3RlZCBvYnNlcnZlZCBz dHJpbmc6ICVAIHRvIG1hdGNoIGV4cGVjdGVkIHN0cmluZzogJUAgYXQgaW5kZXg6ICV0dSIsIG9i c2VydmVkU3RyaW5nLCBleHBlY3RlZFN0cmluZywgaW5kZXgpOworICAgIH0KK30KKwogbmFtZXNw YWNlIFRlc3RXZWJLaXRBUEkgewogCiBURVNUKERhdGFJbnRlcmFjdGlvblRlc3RzLCBJbWFnZVRv Q29udGVudEVkaXRhYmxlKQpAQCAtOTI5LDYgKzk0MSwzMyBAQCBURVNUKERhdGFJbnRlcmFjdGlv blRlc3RzLCBMaW5rV2l0aEVtcHR5SFJFRikKICAgICBFWFBFQ1RfV0tfU1RSRVEoIiIsIFt3ZWJW aWV3IGVkaXRvclZhbHVlXS5VVEY4U3RyaW5nKTsKIH0KIAorVEVTVChEYXRhSW50ZXJhY3Rpb25U ZXN0cywgQ2FuY2VsbGVkTGlmdERvZXNOb3RDYXVzZVN1YnNlcXVlbnREcmFnc1RvRmFpbCkKK3sK KyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdp dGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDMyMCwgNTAwKV0pOworICAgIFt3ZWJWaWV3IHN5bmNo cm9ub3VzbHlMb2FkVGVzdFBhZ2VOYW1lZDpAImxpbmstYW5kLXRhcmdldC1kaXYiXTsKKworICAg IGF1dG8gZGF0YUludGVyYWN0aW9uU2ltdWxhdG9yID0gYWRvcHROUyhbW0RhdGFJbnRlcmFjdGlv blNpbXVsYXRvciBhbGxvY10gaW5pdFdpdGhXZWJWaWV3OndlYlZpZXcuZ2V0KCldKTsKKyAgICBb ZGF0YUludGVyYWN0aW9uU2ltdWxhdG9yIHNldENvbnZlcnRJdGVtUHJvdmlkZXJzQmxvY2s6Xk5T QXJyYXkgKihVSUl0ZW1Qcm92aWRlciAqLCBOU0FycmF5ICosIE5TRGljdGlvbmFyeSAqKQorICAg IHsKKyAgICAgICAgcmV0dXJuIEBbIF07CisgICAgfV07CisgICAgW2RhdGFJbnRlcmFjdGlvblNp bXVsYXRvciBydW5Gcm9tOkNHUG9pbnRNYWtlKDEwMCwgNTApIHRvOkNHUG9pbnRNYWtlKDEwMCwg MzAwKV07CisgICAgRVhQRUNUX0VRKERhdGFJbnRlcmFjdGlvbkNhbmNlbGxlZCwgW2RhdGFJbnRl cmFjdGlvblNpbXVsYXRvciBwaGFzZV0pOworICAgIEVYUEVDVF9XS19TVFJFUSgiIiwgW3dlYlZp ZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAInRhcmdldC50ZXh0Q29udGVudCJdKTsK KyAgICBOU1N0cmluZyAqb3V0cHV0VGV4dCA9IFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0ph dmFTY3JpcHQ6QCJvdXRwdXQudGV4dENvbnRlbnQiXTsKKyAgICBjaGVja1N0cmluZ0FycmF5c0Fy ZUVxdWFsKEBbQCJkcmFnc3RhcnQiLCBAImRyYWdlbmQiXSwgW291dHB1dFRleHQgY29tcG9uZW50 c1NlcGFyYXRlZEJ5U3RyaW5nOkAiICJdKTsKKworICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVh dGluZ0phdmFTY3JpcHQ6QCJvdXRwdXQuaW5uZXJIVE1MID0gJyciXTsKKyAgICBbZGF0YUludGVy YWN0aW9uU2ltdWxhdG9yIHNldENvbnZlcnRJdGVtUHJvdmlkZXJzQmxvY2s6Xk5TQXJyYXkgKihV SUl0ZW1Qcm92aWRlciAqaXRlbVByb3ZpZGVyLCBOU0FycmF5ICosIE5TRGljdGlvbmFyeSAqKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIEBbIGl0ZW1Qcm92aWRlciBdOworICAgIH1dOworICAgIFtk YXRhSW50ZXJhY3Rpb25TaW11bGF0b3IgcnVuRnJvbTpDR1BvaW50TWFrZSgxMDAsIDUwKSB0bzpD R1BvaW50TWFrZSgxMDAsIDMwMCldOworICAgIEVYUEVDVF9XS19TVFJFUSgiUEFTUyIsIFt3ZWJW aWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJ0YXJnZXQudGV4dENvbnRlbnQiXSk7 CisgICAgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAIm91dHB1dC50ZXh0 Q29udGVudCJdOworICAgIGNoZWNrU3RyaW5nQXJyYXlzQXJlRXF1YWwoQFtAImRyYWdzdGFydCIs IEAiZHJhZ2VuZCJdLCBbb3V0cHV0VGV4dCBjb21wb25lbnRzU2VwYXJhdGVkQnlTdHJpbmc6QCIg Il0pOworfQorCiBURVNUKERhdGFJbnRlcmFjdGlvblRlc3RzLCBDdXN0b21BY3Rpb25TaGVldFBv cG92ZXIpCiB7CiAgICAgUmV0YWluUHRyPFRlc3RXS1dlYlZpZXc+IHdlYlZpZXcgPSBhZG9wdE5T KFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDMy MCwgNTAwKV0pOwo=