237815 2022-03-12 21:00:46 -0800 [macOS] Tooltip no longer disappears after leaving hovered element 2022-03-15 07:26:50 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi hi katherine_cheney megan_gardner thorton webkit-bug-importer oldest_to_newest 1850739 0 wenson_hsieh 2022-03-12 21:00:46 -0800 rdar://90187247 1850742 1 454547 wenson_hsieh 2022-03-12 21:43:54 -0800 Created attachment 454547 Patch 1850750 2 454550 wenson_hsieh 2022-03-12 22:23:59 -0800 Created attachment 454550 Fix debug builds 1850995 3 454550 ap 2022-03-14 13:46:06 -0700 Comment on attachment 454550 Fix debug builds View in context: https://bugs.webkit.org/attachment.cgi?id=454550&action=review > Source/WebKit/ChangeLog:9 > + On certain versions of macOS, AppKit's tooltip management system installs tracking areas (NSTrackingArea) using Do we need to do anything in Legacy WebKit for this? I don't know much about NSTrackingAreas, but I know that there is code for those in WebHTMLView.mm. 1850999 4 454550 wenson_hsieh 2022-03-14 13:59:20 -0700 Comment on attachment 454550 Fix debug builds (In reply to Alexey Proskuryakov from comment #3) > Comment on attachment 454550 [details] > Fix debug builds > > View in context: > https://bugs.webkit.org/attachment.cgi?id=454550&action=review > > > Source/WebKit/ChangeLog:9 > > + On certain versions of macOS, AppKit's tooltip management system installs tracking areas (NSTrackingArea) using > > Do we need to do anything in Legacy WebKit for this? I don't know much about > NSTrackingAreas, but I know that there is code for those in WebHTMLView.mm. Good catch — confirmed that the same bug repros in WK1 as well. I suppose I'll fix both in this same patch. 1851065 5 454634 wenson_hsieh 2022-03-14 16:18:19 -0700 Created attachment 454634 Patch 1851267 6 454634 wenson_hsieh 2022-03-15 06:47:59 -0700 Comment on attachment 454634 Patch Thanks for the review! 1851288 7 ews-feeder 2022-03-15 07:26:47 -0700 Committed r291287 (248426@main): <https://commits.webkit.org/248426@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454634. 454547 2022-03-12 21:43:54 -0800 2022-03-12 22:56:47 -0800 Patch bug-237815-20220312214354.patch text/plain 6027 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVhOGQ2NGI2YjEwYTgzNjU5 NmQxOTlmOWU0NmJhOTI5OTg2ODg4NjIuLmU2YzM0MTAzZmRiODAyN2U4ZjliYjY2YjczNTZhYmRi NDFiNGU4M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjItMDMtMTIgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBUb29sdGlw IG5vIGxvbmdlciBkaXNhcHBlYXJzIGFmdGVyIGxlYXZpbmcgaG92ZXJlZCBlbGVtZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc4MTUKKyAgICAg ICAgcmRhcjovLzkwMTg3MjQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgT24gY2VydGFpbiB2ZXJzaW9ucyBvZiBtYWNPUywgQXBwS2l0J3MgdG9vbHRp cCBtYW5hZ2VtZW50IHN5c3RlbSBpbnN0YWxscyB0cmFja2luZyBhcmVhcyAoTlNUcmFja2luZ0Fy ZWEpIHVzaW5nCisgICAgICAgIGAtYWRkVHJhY2tpbmdBcmVhOmAgaW5zdGVhZCBvZiB0cmFja2lu ZyByZWN0cy4gVGhpcyBicmVha3Mgb3VyIGV4aXN0aW5nIG1lY2hhbmlzbSBmb3Iga2VlcGluZyB0 cmFjayBvZiB0aGUKKyAgICAgICAgY3VycmVudCB0cmFja2luZyByZWN0IG93bmVyIGJ5IG92ZXJy aWRpbmcgYC1hZGRUcmFja2luZ1JlY3Q6b3duZXI6dXNlckRhdGE6YXNzdW1lSW5zaWRlOmAgKHdo aWNoIGFzc3VtZXMgdGhhdAorICAgICAgICB0aGUgb25seSBjbGllbnQgdGhhdCBhZGRzIHRyYWNr aW5nIHJlY3RzIGlzIHRoZSB0b29sdGlwIG1hbmFnZXIpLiBTaW5jZSBgLWFkZFRyYWNraW5nUmVj dDpgIGlzbid0IGNhbGxlZCwKKyAgICAgICAgYG1fdHJhY2tpbmdSZWN0T3duZXJgIHJlbWFpbnMg bmlsLCB3aGljaCBjYXVzZXMgYm90aCBgc2VuZFRvb2xUaXBNb3VzZUV4aXRlZCgpYCBhbmQgYHNl bmRUb29sVGlwTW91c2VFbnRlcmVkKClgCisgICAgICAgIHRvIGJlIG5vLW9wcy4KKworICAgICAg ICBUbyBmaXggdGhpcywgaW4gdGhlIGNhc2Ugd2hlcmUgYG1fdHJhY2tpbmdSZWN0T3duZXJgIGlz IG5pbCwgd2UgaW5zdGVhZCBmYWxsIGJhY2sgb24gYC1bV0tXZWJWaWV3IHRyYWNraW5nQXJlYXNd YAorICAgICAgICBhbmQgbG9vayBmb3IgYW4gTlNUcmFja2luZ0FyZWEgdGhhdCdzIG93bmVkIGJ5 IEFwcEtpdCdzIE5TVG9vbFRpcE1hbmFnZXIuIFdlIHRoZW4gc2VuZCBmYWtlIG1vdXNlIGVudGVy L2V4aXQKKyAgICAgICAgZXZlbnRzIHRvIHRoaXMgb3duZXIsIHRoZSBzYW1lIHdheSBhcyB3ZSBj dXJyZW50bHkgZG8uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW06CisgICAgICAgIChXZWJL aXQ6OldlYlZpZXdJbXBsOjp0b29sVGlwVHJhY2tpbmdBcmVhT3duZXIgY29uc3QpOgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2VuZFRvb2xUaXBNb3VzZUV4aXRlZCk6CisgICAgICAg IChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZW5kVG9vbFRpcE1vdXNlRW50ZXJlZCk6CisKIDIwMjIt MDMtMTEgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAg W01haWwgQ29tcG9zZV0gU3BlbGxpbmcgYW5kIGdyYW1tYXIgY29udGV4dCBtZW51IGl0ZW1zIG5l ZWQgY3VzdG9tIGlkZW50aWZpZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db2NvYS9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi Vmlld0ltcGwuaAppbmRleCBmNGE2YTMzOTFjMWQyMGM3NGJlMjYzYTcyNzNmNDU2MjBiZGIyZTE1 Li4wYTgwN2ZlMzA0MjVhYzNmMDgxNmRmNTJmM2YxZDBjM2JmYTQwYTU1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgKQEAgLTczNyw2ICs3MzcsOCBAQCBw cml2YXRlOgogCiAgICAgdm9pZCB2aWV3V2lsbE1vdmVUb1dpbmRvd0ltcGwoTlNXaW5kb3cgKik7 CiAKKyAgICBpZCB0b29sVGlwVHJhY2tpbmdBcmVhT3duZXIoKSBjb25zdDsKKwogI2lmIEVOQUJM RShEUkFHX1NVUFBPUlQpCiAgICAgdm9pZCBzZW5kRHJhZ0VuZFRvUGFnZShDR1BvaW50IGVuZFBv aW50LCBOU0RyYWdPcGVyYXRpb24pOwogI2VuZGlmCkBAIC04MjAsNyArODIyLDcgQEAgcHJpdmF0 ZToKICAgICBSZXRhaW5QdHI8TlNUcmFja2luZ0FyZWE+IG1fcHJpbWFyeVRyYWNraW5nQXJlYTsK IAogICAgIE5TVG9vbFRpcFRhZyBtX2xhc3RUb29sVGlwVGFnIHsgMCB9OwotICAgIGlkIG1fdHJh Y2tpbmdSZWN0T3duZXIgeyBuaWwgfTsKKyAgICBXZWFrT2JqQ1B0cjxpZD4gbV90cmFja2luZ1Jl Y3RPd25lcjsKICAgICB2b2lkKiBtX3RyYWNraW5nUmVjdFVzZXJEYXRhIHsgbnVsbHB0ciB9Owog CiAgICAgUmV0YWluUHRyPENBTGF5ZXI+IG1fcm9vdExheWVyOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQppbmRleCA3MjdhYmIyNmNlZDRhMWUyN2IzM2Jl Yzg5NjRmMTQwNzQzMGNlZDdhLi5jNmZjYjQ3Zjk2ZDk0YjAyOWZmMmYyYzlkODM4YWIyYTg5YWJk NzIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1w bC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQpA QCAtMzk0MCwzNCArMzk0MCw1MSBAQCB2b2lkIFdlYlZpZXdJbXBsOjpyZW1vdmVUcmFja2luZ1Jl Y3RzKE5TVHJhY2tpbmdSZWN0VGFnICp0YWdzLCBpbnQgY291bnQpCiAgICAgfQogfQogCitpZCBX ZWJWaWV3SW1wbDo6dG9vbFRpcFRyYWNraW5nQXJlYU93bmVyKCkgY29uc3QKK3sKKyAgICBpZiAo aWQgb3duZXIgPSBtX3RyYWNraW5nUmVjdE93bmVyLmdldEF1dG9yZWxlYXNlZCgpKQorICAgICAg ICByZXR1cm4gb3duZXI7CisKKyAgICBmb3IgKE5TVHJhY2tpbmdBcmVhICp0cmFja2luZ0FyZWEg aW4gdmlldygpLnRyYWNraW5nQXJlYXMpIHsKKyAgICAgICAgc3RhdGljIENsYXNzIG1hbmFnZXJD bGFzczsKKyAgICAgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFnOworICAgICAgICBz dGQ6OmNhbGxfb25jZShvbmNlRmxhZywgW10geworICAgICAgICAgICAgbWFuYWdlckNsYXNzID0g TlNDbGFzc0Zyb21TdHJpbmcoQCJOU1Rvb2xUaXBNYW5hZ2VyIik7CisgICAgICAgIH0pOworCisg ICAgICAgIGlkIG93bmVyID0gdHJhY2tpbmdBcmVhLm93bmVyOworICAgICAgICBpZiAoW293bmVy IGNsYXNzXSA9PSBtYW5hZ2VyQ2xhc3MpCisgICAgICAgICAgICByZXR1cm4gb3duZXI7CisgICAg fQorICAgIHJldHVybiBuaWw7Cit9CisKIHZvaWQgV2ViVmlld0ltcGw6OnNlbmRUb29sVGlwTW91 c2VFeGl0ZWQoKQogewogICAgIC8vIE5vdGhpbmcgbWF0dGVycyBleGNlcHQgd2luZG93LCB0cmFj a2luZ051bWJlciwgYW5kIHVzZXJEYXRhLgotICAgIE5TRXZlbnQgKmZha2VFdmVudCA9IFtOU0V2 ZW50IGVudGVyRXhpdEV2ZW50V2l0aFR5cGU6TlNFdmVudFR5cGVNb3VzZUV4aXRlZAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9jYXRpb246TlNNYWtl UG9pbnQoMCwgMCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBt b2RpZmllckZsYWdzOjAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdGltZXN0YW1wOjAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgd2luZG93TnVtYmVyOlttX3ZpZXcgd2luZG93XS53aW5kb3dOdW1iZXIKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0Ok5VTEwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50TnVtYmVyOjAK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRyYWNraW5nTnVtYmVy OlRSQUNLSU5HX1JFQ1RfVEFHCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1c2VyRGF0YTptX3RyYWNraW5nUmVjdFVzZXJEYXRhXTsKLSAgICBbbV90cmFj a2luZ1JlY3RPd25lciBtb3VzZUV4aXRlZDpmYWtlRXZlbnRdOworICAgIFt0b29sVGlwVHJhY2tp bmdBcmVhT3duZXIoKSBtb3VzZUV4aXRlZDpbTlNFdmVudCBlbnRlckV4aXRFdmVudFdpdGhUeXBl Ok5TRXZlbnRUeXBlTW91c2VFeGl0ZWQKKyAgICAgICAgbG9jYXRpb246TlNaZXJvUG9pbnQKKyAg ICAgICAgbW9kaWZpZXJGbGFnczowCisgICAgICAgIHRpbWVzdGFtcDowCisgICAgICAgIHdpbmRv d051bWJlcjpbbV92aWV3IHdpbmRvd10ud2luZG93TnVtYmVyCisgICAgICAgIGNvbnRleHQ6bmls CisgICAgICAgIGV2ZW50TnVtYmVyOjAKKyAgICAgICAgdHJhY2tpbmdOdW1iZXI6VFJBQ0tJTkdf UkVDVF9UQUcKKyAgICAgICAgdXNlckRhdGE6bV90cmFja2luZ1JlY3RVc2VyRGF0YV1dOwogfQog CiB2b2lkIFdlYlZpZXdJbXBsOjpzZW5kVG9vbFRpcE1vdXNlRW50ZXJlZCgpCiB7CiAgICAgLy8g Tm90aGluZyBtYXR0ZXJzIGV4Y2VwdCB3aW5kb3csIHRyYWNraW5nTnVtYmVyLCBhbmQgdXNlckRh dGEuCi0gICAgTlNFdmVudCAqZmFrZUV2ZW50ID0gW05TRXZlbnQgZW50ZXJFeGl0RXZlbnRXaXRo VHlwZTpOU0V2ZW50VHlwZU1vdXNlRW50ZXJlZAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbG9jYXRpb246TlNNYWtlUG9pbnQoMCwgMCkKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtb2RpZmllckZsYWdzOjAKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGltZXN0YW1wOjAKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2luZG93TnVtYmVyOltt X3ZpZXcgd2luZG93XS53aW5kb3dOdW1iZXIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb250ZXh0Ok5VTEwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGV2ZW50TnVtYmVyOjAKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHRyYWNraW5nTnVtYmVyOlRSQUNLSU5HX1JFQ1RfVEFHCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1c2VyRGF0YTpt X3RyYWNraW5nUmVjdFVzZXJEYXRhXTsKLSAgICBbbV90cmFja2luZ1JlY3RPd25lciBtb3VzZUVu dGVyZWQ6ZmFrZUV2ZW50XTsKKyAgICBbdG9vbFRpcFRyYWNraW5nQXJlYU93bmVyKCkgbW91c2VF bnRlcmVkOltOU0V2ZW50IGVudGVyRXhpdEV2ZW50V2l0aFR5cGU6TlNFdmVudFR5cGVNb3VzZUVu dGVyZWQKKyAgICAgICAgbG9jYXRpb246TlNaZXJvUG9pbnQKKyAgICAgICAgbW9kaWZpZXJGbGFn czowCisgICAgICAgIHRpbWVzdGFtcDowCisgICAgICAgIHdpbmRvd051bWJlcjpbbV92aWV3IHdp bmRvd10ud2luZG93TnVtYmVyCisgICAgICAgIGNvbnRleHQ6bmlsCisgICAgICAgIGV2ZW50TnVt YmVyOjAKKyAgICAgICAgdHJhY2tpbmdOdW1iZXI6VFJBQ0tJTkdfUkVDVF9UQUcKKyAgICAgICAg dXNlckRhdGE6bV90cmFja2luZ1JlY3RVc2VyRGF0YV1dOwogfQogCiBOU1N0cmluZyAqV2ViVmll d0ltcGw6OnN0cmluZ0ZvclRvb2xUaXAoTlNUb29sVGlwVGFnIHRhZykK 454550 2022-03-12 22:23:59 -0800 2022-03-14 16:18:17 -0700 Fix debug builds bug-237815-20220312222358.patch text/plain 7464 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVhOGQ2NGI2YjEwYTgzNjU5 NmQxOTlmOWU0NmJhOTI5OTg2ODg4NjIuLjY1MWYwZTk1MDEwN2M0ZmI1YjFhOTZhOGM3ZDdiZjkz MDc1OTU2YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjItMDMtMTIgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBUb29sdGlw IG5vIGxvbmdlciBkaXNhcHBlYXJzIGFmdGVyIGxlYXZpbmcgaG92ZXJlZCBlbGVtZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc4MTUKKyAgICAg ICAgcmRhcjovLzkwMTg3MjQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgT24gY2VydGFpbiB2ZXJzaW9ucyBvZiBtYWNPUywgQXBwS2l0J3MgdG9vbHRp cCBtYW5hZ2VtZW50IHN5c3RlbSBpbnN0YWxscyB0cmFja2luZyBhcmVhcyAoTlNUcmFja2luZ0Fy ZWEpIHVzaW5nCisgICAgICAgIGAtYWRkVHJhY2tpbmdBcmVhOmAgaW5zdGVhZCBvZiB0cmFja2lu ZyByZWN0cy4gVGhpcyBicmVha3Mgb3VyIGV4aXN0aW5nIG1lY2hhbmlzbSBmb3Iga2VlcGluZyB0 cmFjayBvZiB0aGUKKyAgICAgICAgY3VycmVudCB0cmFja2luZyByZWN0IG93bmVyIGJ5IG92ZXJy aWRpbmcgYC1hZGRUcmFja2luZ1JlY3Q6b3duZXI6dXNlckRhdGE6YXNzdW1lSW5zaWRlOmAgKHdo aWNoIGFzc3VtZXMgdGhhdAorICAgICAgICB0aGUgb25seSBjbGllbnQgdGhhdCBhZGRzIHRyYWNr aW5nIHJlY3RzIGlzIHRoZSB0b29sdGlwIG1hbmFnZXIpLiBTaW5jZSBgLWFkZFRyYWNraW5nUmVj dDpgIGlzbid0IGNhbGxlZCwKKyAgICAgICAgYG1fdHJhY2tpbmdSZWN0T3duZXJgIHJlbWFpbnMg bmlsLCB3aGljaCBjYXVzZXMgYm90aCBgc2VuZFRvb2xUaXBNb3VzZUV4aXRlZCgpYCBhbmQgYHNl bmRUb29sVGlwTW91c2VFbnRlcmVkKClgCisgICAgICAgIHRvIGJlIG5vLW9wcy4KKworICAgICAg ICBUbyBmaXggdGhpcywgaW4gdGhlIGNhc2Ugd2hlcmUgYG1fdHJhY2tpbmdSZWN0T3duZXJgIGlz IG5pbCwgd2UgaW5zdGVhZCBmYWxsIGJhY2sgb24gYC1bV0tXZWJWaWV3IHRyYWNraW5nQXJlYXNd YAorICAgICAgICBhbmQgbG9vayBmb3IgYW4gTlNUcmFja2luZ0FyZWEgdGhhdCdzIG93bmVkIGJ5 IEFwcEtpdCdzIE5TVG9vbFRpcE1hbmFnZXIuIFdlIHRoZW4gc2VuZCBmYWtlIG1vdXNlIGVudGVy L2V4aXQKKyAgICAgICAgZXZlbnRzIHRvIHRoaXMgb3duZXIsIHRoZSBzYW1lIHdheSBhcyB3ZSBj dXJyZW50bHkgZG8uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW06CisgICAgICAgIChXZWJL aXQ6OldlYlZpZXdJbXBsOjphZGRUcmFja2luZ1JlY3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJW aWV3SW1wbDo6YWRkVHJhY2tpbmdSZWN0V2l0aFRyYWNraW5nTnVtKToKKyAgICAgICAgKFdlYktp dDo6V2ViVmlld0ltcGw6OmFkZFRyYWNraW5nUmVjdHNXaXRoVHJhY2tpbmdOdW1zKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnRvb2xUaXBUcmFja2luZ0FyZWFPd25lciBjb25zdCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZW5kVG9vbFRpcE1vdXNlRXhpdGVkKToK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNlbmRUb29sVGlwTW91c2VFbnRlcmVkKToK KwogMjAyMi0wMy0xMSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTWFpbCBDb21wb3NlXSBTcGVsbGluZyBhbmQgZ3JhbW1hciBjb250ZXh0IG1lbnUg aXRlbXMgbmVlZCBjdXN0b20gaWRlbnRpZmllcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9XZWJWaWV3SW1wbC5oCmluZGV4IGY0YTZhMzM5MWMxZDIwYzc0YmUyNjNhNzI3M2Y0NTYy MGJkYjJlMTUuLjBhODA3ZmUzMDQyNWFjM2YwODE2ZGY1MmYzZjFkMGMzYmZhNDBhNTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaApAQCAtNzM3LDYgKzcz Nyw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHZpZXdXaWxsTW92ZVRvV2luZG93SW1wbChOU1dp bmRvdyAqKTsKIAorICAgIGlkIHRvb2xUaXBUcmFja2luZ0FyZWFPd25lcigpIGNvbnN0OworCiAj aWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKICAgICB2b2lkIHNlbmREcmFnRW5kVG9QYWdlKENHUG9p bnQgZW5kUG9pbnQsIE5TRHJhZ09wZXJhdGlvbik7CiAjZW5kaWYKQEAgLTgyMCw3ICs4MjIsNyBA QCBwcml2YXRlOgogICAgIFJldGFpblB0cjxOU1RyYWNraW5nQXJlYT4gbV9wcmltYXJ5VHJhY2tp bmdBcmVhOwogCiAgICAgTlNUb29sVGlwVGFnIG1fbGFzdFRvb2xUaXBUYWcgeyAwIH07Ci0gICAg aWQgbV90cmFja2luZ1JlY3RPd25lciB7IG5pbCB9OworICAgIFdlYWtPYmpDUHRyPGlkPiBtX3Ry YWNraW5nUmVjdE93bmVyOwogICAgIHZvaWQqIG1fdHJhY2tpbmdSZWN0VXNlckRhdGEgeyBudWxs cHRyIH07CiAKICAgICBSZXRhaW5QdHI8Q0FMYXllcj4gbV9yb290TGF5ZXI7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCmluZGV4IDcyN2FiYjI2Y2VkNGEx ZTI3YjMzYmVjODk2NGYxNDA3NDMwY2VkN2EuLmJmMmUyYTE1M2FhNzc4OGUzYTEwMzk5ZWQ0ZjQy ODgzYzA5NjZlNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl YlZpZXdJbXBsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJ bXBsLm1tCkBAIC0zODgzLDcgKzM4ODMsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjp1cGRhdGVQcmlt YXJ5VHJhY2tpbmdBcmVhT3B0aW9ucyhOU1RyYWNraW5nQXJlYU9wdGlvbnMgb3B0aW9ucwogCiBO U1RyYWNraW5nUmVjdFRhZyBXZWJWaWV3SW1wbDo6YWRkVHJhY2tpbmdSZWN0KENHUmVjdCwgaWQg b3duZXIsIHZvaWQqIHVzZXJEYXRhLCBib29sIGFzc3VtZUluc2lkZSkKIHsKLSAgICBBU1NFUlQo bV90cmFja2luZ1JlY3RPd25lciA9PSBuaWwpOworICAgIEFTU0VSVCghbV90cmFja2luZ1JlY3RP d25lcik7CiAgICAgbV90cmFja2luZ1JlY3RPd25lciA9IG93bmVyOwogICAgIG1fdHJhY2tpbmdS ZWN0VXNlckRhdGEgPSB1c2VyRGF0YTsKICAgICByZXR1cm4gVFJBQ0tJTkdfUkVDVF9UQUc7CkBA IC0zODkyLDcgKzM4OTIsNyBAQCBOU1RyYWNraW5nUmVjdFRhZyBXZWJWaWV3SW1wbDo6YWRkVHJh Y2tpbmdSZWN0KENHUmVjdCwgaWQgb3duZXIsIHZvaWQqIHVzZXJEYXRhLAogTlNUcmFja2luZ1Jl Y3RUYWcgV2ViVmlld0ltcGw6OmFkZFRyYWNraW5nUmVjdFdpdGhUcmFja2luZ051bShDR1JlY3Qs IGlkIG93bmVyLCB2b2lkKiB1c2VyRGF0YSwgYm9vbCBhc3N1bWVJbnNpZGUsIGludCB0YWcpCiB7 CiAgICAgQVNTRVJUKHRhZyA9PSAwIHx8IHRhZyA9PSBUUkFDS0lOR19SRUNUX1RBRyk7Ci0gICAg QVNTRVJUKG1fdHJhY2tpbmdSZWN0T3duZXIgPT0gbmlsKTsKKyAgICBBU1NFUlQoIW1fdHJhY2tp bmdSZWN0T3duZXIpOwogICAgIG1fdHJhY2tpbmdSZWN0T3duZXIgPSBvd25lcjsKICAgICBtX3Ry YWNraW5nUmVjdFVzZXJEYXRhID0gdXNlckRhdGE7CiAgICAgcmV0dXJuIFRSQUNLSU5HX1JFQ1Rf VEFHOwpAQCAtMzkwMiw3ICszOTAyLDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6YWRkVHJhY2tpbmdS ZWN0c1dpdGhUcmFja2luZ051bXMoQ0dSZWN0KiwgaWQgb3duZXIsIHZvaWQqKiB1c2UKIHsKICAg ICBBU1NFUlQoY291bnQgPT0gMSk7CiAgICAgQVNTRVJUKHRyYWNraW5nTnVtc1swXSA9PSAwIHx8 IHRyYWNraW5nTnVtc1swXSA9PSBUUkFDS0lOR19SRUNUX1RBRyk7Ci0gICAgQVNTRVJUKG1fdHJh Y2tpbmdSZWN0T3duZXIgPT0gbmlsKTsKKyAgICBBU1NFUlQoIW1fdHJhY2tpbmdSZWN0T3duZXIp OwogICAgIG1fdHJhY2tpbmdSZWN0T3duZXIgPSBvd25lcjsKICAgICBtX3RyYWNraW5nUmVjdFVz ZXJEYXRhID0gdXNlckRhdGFMaXN0WzBdOwogICAgIHRyYWNraW5nTnVtc1swXSA9IFRSQUNLSU5H X1JFQ1RfVEFHOwpAQCAtMzk0MCwzNCArMzk0MCw1MSBAQCB2b2lkIFdlYlZpZXdJbXBsOjpyZW1v dmVUcmFja2luZ1JlY3RzKE5TVHJhY2tpbmdSZWN0VGFnICp0YWdzLCBpbnQgY291bnQpCiAgICAg fQogfQogCitpZCBXZWJWaWV3SW1wbDo6dG9vbFRpcFRyYWNraW5nQXJlYU93bmVyKCkgY29uc3QK K3sKKyAgICBpZiAoaWQgb3duZXIgPSBtX3RyYWNraW5nUmVjdE93bmVyLmdldEF1dG9yZWxlYXNl ZCgpKQorICAgICAgICByZXR1cm4gb3duZXI7CisKKyAgICBmb3IgKE5TVHJhY2tpbmdBcmVhICp0 cmFja2luZ0FyZWEgaW4gdmlldygpLnRyYWNraW5nQXJlYXMpIHsKKyAgICAgICAgc3RhdGljIENs YXNzIG1hbmFnZXJDbGFzczsKKyAgICAgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFn OworICAgICAgICBzdGQ6OmNhbGxfb25jZShvbmNlRmxhZywgW10geworICAgICAgICAgICAgbWFu YWdlckNsYXNzID0gTlNDbGFzc0Zyb21TdHJpbmcoQCJOU1Rvb2xUaXBNYW5hZ2VyIik7CisgICAg ICAgIH0pOworCisgICAgICAgIGlkIG93bmVyID0gdHJhY2tpbmdBcmVhLm93bmVyOworICAgICAg ICBpZiAoW293bmVyIGNsYXNzXSA9PSBtYW5hZ2VyQ2xhc3MpCisgICAgICAgICAgICByZXR1cm4g b3duZXI7CisgICAgfQorICAgIHJldHVybiBuaWw7Cit9CisKIHZvaWQgV2ViVmlld0ltcGw6OnNl bmRUb29sVGlwTW91c2VFeGl0ZWQoKQogewogICAgIC8vIE5vdGhpbmcgbWF0dGVycyBleGNlcHQg d2luZG93LCB0cmFja2luZ051bWJlciwgYW5kIHVzZXJEYXRhLgotICAgIE5TRXZlbnQgKmZha2VF dmVudCA9IFtOU0V2ZW50IGVudGVyRXhpdEV2ZW50V2l0aFR5cGU6TlNFdmVudFR5cGVNb3VzZUV4 aXRlZAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9j YXRpb246TlNNYWtlUG9pbnQoMCwgMCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBtb2RpZmllckZsYWdzOjAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdGltZXN0YW1wOjAKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgd2luZG93TnVtYmVyOlttX3ZpZXcgd2luZG93XS53aW5kb3dOdW1i ZXIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250 ZXh0Ok5VTEwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV2 ZW50TnVtYmVyOjAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRy YWNraW5nTnVtYmVyOlRSQUNLSU5HX1JFQ1RfVEFHCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB1c2VyRGF0YTptX3RyYWNraW5nUmVjdFVzZXJEYXRhXTsK LSAgICBbbV90cmFja2luZ1JlY3RPd25lciBtb3VzZUV4aXRlZDpmYWtlRXZlbnRdOworICAgIFt0 b29sVGlwVHJhY2tpbmdBcmVhT3duZXIoKSBtb3VzZUV4aXRlZDpbTlNFdmVudCBlbnRlckV4aXRF dmVudFdpdGhUeXBlOk5TRXZlbnRUeXBlTW91c2VFeGl0ZWQKKyAgICAgICAgbG9jYXRpb246TlNa ZXJvUG9pbnQKKyAgICAgICAgbW9kaWZpZXJGbGFnczowCisgICAgICAgIHRpbWVzdGFtcDowCisg ICAgICAgIHdpbmRvd051bWJlcjpbbV92aWV3IHdpbmRvd10ud2luZG93TnVtYmVyCisgICAgICAg IGNvbnRleHQ6bmlsCisgICAgICAgIGV2ZW50TnVtYmVyOjAKKyAgICAgICAgdHJhY2tpbmdOdW1i ZXI6VFJBQ0tJTkdfUkVDVF9UQUcKKyAgICAgICAgdXNlckRhdGE6bV90cmFja2luZ1JlY3RVc2Vy RGF0YV1dOwogfQogCiB2b2lkIFdlYlZpZXdJbXBsOjpzZW5kVG9vbFRpcE1vdXNlRW50ZXJlZCgp CiB7CiAgICAgLy8gTm90aGluZyBtYXR0ZXJzIGV4Y2VwdCB3aW5kb3csIHRyYWNraW5nTnVtYmVy LCBhbmQgdXNlckRhdGEuCi0gICAgTlNFdmVudCAqZmFrZUV2ZW50ID0gW05TRXZlbnQgZW50ZXJF eGl0RXZlbnRXaXRoVHlwZTpOU0V2ZW50VHlwZU1vdXNlRW50ZXJlZAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9jYXRpb246TlNNYWtlUG9pbnQoMCwg MCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtb2RpZmllckZs YWdzOjAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGlt ZXN0YW1wOjAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2lu ZG93TnVtYmVyOlttX3ZpZXcgd2luZG93XS53aW5kb3dOdW1iZXIKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0Ok5VTEwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50TnVtYmVyOjAKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRyYWNraW5nTnVtYmVyOlRSQUNLSU5H X1JFQ1RfVEFHCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB1c2VyRGF0YTptX3RyYWNraW5nUmVjdFVzZXJEYXRhXTsKLSAgICBbbV90cmFja2luZ1JlY3RP d25lciBtb3VzZUVudGVyZWQ6ZmFrZUV2ZW50XTsKKyAgICBbdG9vbFRpcFRyYWNraW5nQXJlYU93 bmVyKCkgbW91c2VFbnRlcmVkOltOU0V2ZW50IGVudGVyRXhpdEV2ZW50V2l0aFR5cGU6TlNFdmVu dFR5cGVNb3VzZUVudGVyZWQKKyAgICAgICAgbG9jYXRpb246TlNaZXJvUG9pbnQKKyAgICAgICAg bW9kaWZpZXJGbGFnczowCisgICAgICAgIHRpbWVzdGFtcDowCisgICAgICAgIHdpbmRvd051bWJl cjpbbV92aWV3IHdpbmRvd10ud2luZG93TnVtYmVyCisgICAgICAgIGNvbnRleHQ6bmlsCisgICAg ICAgIGV2ZW50TnVtYmVyOjAKKyAgICAgICAgdHJhY2tpbmdOdW1iZXI6VFJBQ0tJTkdfUkVDVF9U QUcKKyAgICAgICAgdXNlckRhdGE6bV90cmFja2luZ1JlY3RVc2VyRGF0YV1dOwogfQogCiBOU1N0 cmluZyAqV2ViVmlld0ltcGw6OnN0cmluZ0ZvclRvb2xUaXAoTlNUb29sVGlwVGFnIHRhZykK 454634 2022-03-14 16:18:19 -0700 2022-03-15 07:26:49 -0700 Patch bug-237815-20220314161818.patch text/plain 11778 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMjQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ5Y2MzYzRmZTY5ZThiY2U1 ZTAxYzg5YWY0ZDA3Yzc1YWM4MGMzZTYuLjA4OTg2ZGUwMjBiNGYxODJiNDUyZTE1MjlkYmVlNWZj MzQyYzUxYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjItMDMtMTQgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBUb29sdGlw IG5vIGxvbmdlciBkaXNhcHBlYXJzIGFmdGVyIGxlYXZpbmcgaG92ZXJlZCBlbGVtZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc4MTUKKyAgICAg ICAgcmRhcjovLzkwMTg3MjQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgT24gY2VydGFpbiB2ZXJzaW9ucyBvZiBtYWNPUywgQXBwS2l0J3MgdG9vbHRp cCBtYW5hZ2VtZW50IHN5c3RlbSBpbnN0YWxscyB0cmFja2luZyBhcmVhcyAoTlNUcmFja2luZ0Fy ZWEpIHVzaW5nCisgICAgICAgIGAtYWRkVHJhY2tpbmdBcmVhOmAgaW5zdGVhZCBvZiB0cmFja2lu ZyByZWN0cy4gVGhpcyBicmVha3Mgb3VyIGV4aXN0aW5nIG1lY2hhbmlzbSBmb3Iga2VlcGluZyB0 cmFjayBvZiB0aGUKKyAgICAgICAgY3VycmVudCB0cmFja2luZyByZWN0IG93bmVyIGJ5IG92ZXJy aWRpbmcgYC1hZGRUcmFja2luZ1JlY3Q6b3duZXI6dXNlckRhdGE6YXNzdW1lSW5zaWRlOmAgKHdo aWNoIGFzc3VtZXMgdGhhdAorICAgICAgICB0aGUgb25seSBjbGllbnQgdGhhdCBhZGRzIHRyYWNr aW5nIHJlY3RzIGlzIHRoZSB0b29sdGlwIG1hbmFnZXIpLiBTaW5jZSBgLWFkZFRyYWNraW5nUmVj dDpgIGlzbid0IGNhbGxlZCwKKyAgICAgICAgYG1fdHJhY2tpbmdSZWN0T3duZXJgIHJlbWFpbnMg bmlsLCB3aGljaCBjYXVzZXMgYm90aCBgc2VuZFRvb2xUaXBNb3VzZUV4aXRlZCgpYCBhbmQgYHNl bmRUb29sVGlwTW91c2VFbnRlcmVkKClgCisgICAgICAgIHRvIGJlIG5vLW9wcy4KKworICAgICAg ICBUbyBmaXggdGhpcywgaW4gdGhlIGNhc2Ugd2hlcmUgYG1fdHJhY2tpbmdSZWN0T3duZXJgIGlz IG5pbCwgd2UgaW5zdGVhZCBmYWxsIGJhY2sgb24gYC1bV0tXZWJWaWV3IHRyYWNraW5nQXJlYXNd YAorICAgICAgICBhbmQgbG9vayBmb3IgYW4gTlNUcmFja2luZ0FyZWEgdGhhdCdzIG93bmVkIGJ5 IEFwcEtpdCdzIE5TVG9vbFRpcE1hbmFnZXIuIFdlIHRoZW4gc2VuZCBmYWtlIG1vdXNlIGVudGVy L2V4aXQKKyAgICAgICAgZXZlbnRzIHRvIHRoaXMgb3duZXIsIHRoZSBzYW1lIHdheSBhcyB3ZSBj dXJyZW50bHkgZG8uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW06CisgICAgICAgIChXZWJL aXQ6OldlYlZpZXdJbXBsOjphZGRUcmFja2luZ1JlY3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJW aWV3SW1wbDo6YWRkVHJhY2tpbmdSZWN0V2l0aFRyYWNraW5nTnVtKToKKyAgICAgICAgKFdlYktp dDo6V2ViVmlld0ltcGw6OmFkZFRyYWNraW5nUmVjdHNXaXRoVHJhY2tpbmdOdW1zKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnRvb2xUaXBUcmFja2luZ0FyZWFPd25lciBjb25zdCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZW5kVG9vbFRpcE1vdXNlRXhpdGVkKToK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNlbmRUb29sVGlwTW91c2VFbnRlcmVkKToK KwogMjAyMi0wMy0xNCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAg ICAgICBbbW9kZWxdIDxtb2RlbCBpbnRlcmFjdGl2ZT4gZG9lc24ndCBhbGxvdyBtb2RlbCB0byBi ZSByb3RhdGVkIG9uIGlPUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4IGY0YTU4NmFi ZjlmMTAzN2NmYmZlYTlmNjIwMWJjYjQ3Mzc1ZWJmMmMuLjEyN2ZiNDQzZDI2NDhjMzQ1NTIzMjkx ZGZiNjkwZGMzODhiM2IzZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMSBAQAorMjAyMi0wMy0xNCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNv bT4KKworICAgICAgICBbbWFjT1NdIFRvb2x0aXAgbm8gbG9uZ2VyIGRpc2FwcGVhcnMgYWZ0ZXIg bGVhdmluZyBob3ZlcmVkIGVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNzgxNQorICAgICAgICByZGFyOi8vOTAxODcyNDcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBcHBseSB0aGUgc2FtZSBm aXggdG8gbGVnYWN5IFdlYktpdDsgc2VlIFdlYktpdC9DaGFuZ2VMb2cgZm9yIG1vcmUgaW5mb3Jt YXRpb24uCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYkhUTUxWaWV3Lm1tOgorCisgICAgICAgIEFs c28gd3JhcCB0aGUgb3duZXIgaW4gYSBXZWFrT2JqQ1B0ciB0byBhdm9pZCB0aGUgcG9zc2liaWxp dHkgb2YgY2FsbGluZyBtZXRob2RzIG9uIGRlYWxsb2NhdGVkIGluc3RhbmNlcy4KKworICAgICAg ICAoLVtXZWJIVE1MVmlldyBfdG9vbFRpcE93bmVyRm9yU2VuZGluZ01vdXNlRXZlbnRzXSk6Cisg ICAgICAgICgtW1dlYkhUTUxWaWV3IF9zZW5kVG9vbFRpcE1vdXNlRXhpdGVkXSk6CisgICAgICAg ICgtW1dlYkhUTUxWaWV3IF9zZW5kVG9vbFRpcE1vdXNlRW50ZXJlZF0pOgorCiAyMDIyLTAzLTEy ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEFkb3B0 IEZBTExCQUNLX1BMQVRGT1JNX05BTUUgaW4gcGxhY2Ugb2YgRkFMTEJBQ0tfUExBVEZPUk0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCmluZGV4IGY0YTZhMzM5 MWMxZDIwYzc0YmUyNjNhNzI3M2Y0NTYyMGJkYjJlMTUuLjg2ZmQ4OTBkYjQ5ZjMwMmY2YjAwN2U0 MDZlNDE4MDhhOGVjMmJmYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL1dlYlZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi Vmlld0ltcGwuaApAQCAtNzM3LDYgKzczNyw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHZpZXdX aWxsTW92ZVRvV2luZG93SW1wbChOU1dpbmRvdyAqKTsKIAorICAgIGlkIHRvb2xUaXBPd25lckZv clNlbmRpbmdNb3VzZUV2ZW50cygpIGNvbnN0OworCiAjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkK ICAgICB2b2lkIHNlbmREcmFnRW5kVG9QYWdlKENHUG9pbnQgZW5kUG9pbnQsIE5TRHJhZ09wZXJh dGlvbik7CiAjZW5kaWYKQEAgLTgyMCw3ICs4MjIsNyBAQCBwcml2YXRlOgogICAgIFJldGFpblB0 cjxOU1RyYWNraW5nQXJlYT4gbV9wcmltYXJ5VHJhY2tpbmdBcmVhOwogCiAgICAgTlNUb29sVGlw VGFnIG1fbGFzdFRvb2xUaXBUYWcgeyAwIH07Ci0gICAgaWQgbV90cmFja2luZ1JlY3RPd25lciB7 IG5pbCB9OworICAgIFdlYWtPYmpDUHRyPGlkPiBtX3RyYWNraW5nUmVjdE93bmVyOwogICAgIHZv aWQqIG1fdHJhY2tpbmdSZWN0VXNlckRhdGEgeyBudWxscHRyIH07CiAKICAgICBSZXRhaW5QdHI8 Q0FMYXllcj4gbV9yb290TGF5ZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db2NvYS9XZWJWaWV3SW1wbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl YlZpZXdJbXBsLm1tCmluZGV4IDcyN2FiYjI2Y2VkNGExZTI3YjMzYmVjODk2NGYxNDA3NDMwY2Vk N2EuLjgxMDNhNjliZjhmNDIwNTAyMGY1OTJiODgzMWNkNGQzYWM1OTc5ZTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCkBAIC0zODgzLDcgKzM4ODMs NyBAQCB2b2lkIFdlYlZpZXdJbXBsOjp1cGRhdGVQcmltYXJ5VHJhY2tpbmdBcmVhT3B0aW9ucyhO U1RyYWNraW5nQXJlYU9wdGlvbnMgb3B0aW9ucwogCiBOU1RyYWNraW5nUmVjdFRhZyBXZWJWaWV3 SW1wbDo6YWRkVHJhY2tpbmdSZWN0KENHUmVjdCwgaWQgb3duZXIsIHZvaWQqIHVzZXJEYXRhLCBi b29sIGFzc3VtZUluc2lkZSkKIHsKLSAgICBBU1NFUlQobV90cmFja2luZ1JlY3RPd25lciA9PSBu aWwpOworICAgIEFTU0VSVCghbV90cmFja2luZ1JlY3RPd25lcik7CiAgICAgbV90cmFja2luZ1Jl Y3RPd25lciA9IG93bmVyOwogICAgIG1fdHJhY2tpbmdSZWN0VXNlckRhdGEgPSB1c2VyRGF0YTsK ICAgICByZXR1cm4gVFJBQ0tJTkdfUkVDVF9UQUc7CkBAIC0zODkyLDcgKzM4OTIsNyBAQCBOU1Ry YWNraW5nUmVjdFRhZyBXZWJWaWV3SW1wbDo6YWRkVHJhY2tpbmdSZWN0KENHUmVjdCwgaWQgb3du ZXIsIHZvaWQqIHVzZXJEYXRhLAogTlNUcmFja2luZ1JlY3RUYWcgV2ViVmlld0ltcGw6OmFkZFRy YWNraW5nUmVjdFdpdGhUcmFja2luZ051bShDR1JlY3QsIGlkIG93bmVyLCB2b2lkKiB1c2VyRGF0 YSwgYm9vbCBhc3N1bWVJbnNpZGUsIGludCB0YWcpCiB7CiAgICAgQVNTRVJUKHRhZyA9PSAwIHx8 IHRhZyA9PSBUUkFDS0lOR19SRUNUX1RBRyk7Ci0gICAgQVNTRVJUKG1fdHJhY2tpbmdSZWN0T3du ZXIgPT0gbmlsKTsKKyAgICBBU1NFUlQoIW1fdHJhY2tpbmdSZWN0T3duZXIpOwogICAgIG1fdHJh Y2tpbmdSZWN0T3duZXIgPSBvd25lcjsKICAgICBtX3RyYWNraW5nUmVjdFVzZXJEYXRhID0gdXNl ckRhdGE7CiAgICAgcmV0dXJuIFRSQUNLSU5HX1JFQ1RfVEFHOwpAQCAtMzkwMiw3ICszOTAyLDcg QEAgdm9pZCBXZWJWaWV3SW1wbDo6YWRkVHJhY2tpbmdSZWN0c1dpdGhUcmFja2luZ051bXMoQ0dS ZWN0KiwgaWQgb3duZXIsIHZvaWQqKiB1c2UKIHsKICAgICBBU1NFUlQoY291bnQgPT0gMSk7CiAg ICAgQVNTRVJUKHRyYWNraW5nTnVtc1swXSA9PSAwIHx8IHRyYWNraW5nTnVtc1swXSA9PSBUUkFD S0lOR19SRUNUX1RBRyk7Ci0gICAgQVNTRVJUKG1fdHJhY2tpbmdSZWN0T3duZXIgPT0gbmlsKTsK KyAgICBBU1NFUlQoIW1fdHJhY2tpbmdSZWN0T3duZXIpOwogICAgIG1fdHJhY2tpbmdSZWN0T3du ZXIgPSBvd25lcjsKICAgICBtX3RyYWNraW5nUmVjdFVzZXJEYXRhID0gdXNlckRhdGFMaXN0WzBd OwogICAgIHRyYWNraW5nTnVtc1swXSA9IFRSQUNLSU5HX1JFQ1RfVEFHOwpAQCAtMzk0MCwzNCAr Mzk0MCw1MyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpyZW1vdmVUcmFja2luZ1JlY3RzKE5TVHJhY2tp bmdSZWN0VGFnICp0YWdzLCBpbnQgY291bnQpCiAgICAgfQogfQogCitpZCBXZWJWaWV3SW1wbDo6 dG9vbFRpcE93bmVyRm9yU2VuZGluZ01vdXNlRXZlbnRzKCkgY29uc3QKK3sKKyAgICBpZiAoaWQg b3duZXIgPSBtX3RyYWNraW5nUmVjdE93bmVyLmdldEF1dG9yZWxlYXNlZCgpKQorICAgICAgICBy ZXR1cm4gb3duZXI7CisKKyAgICBmb3IgKE5TVHJhY2tpbmdBcmVhICp0cmFja2luZ0FyZWEgaW4g dmlldygpLnRyYWNraW5nQXJlYXMpIHsKKyAgICAgICAgc3RhdGljIENsYXNzIG1hbmFnZXJDbGFz czsKKyAgICAgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFnOworICAgICAgICBzdGQ6 OmNhbGxfb25jZShvbmNlRmxhZywgW10geworICAgICAgICAgICAgbWFuYWdlckNsYXNzID0gTlND bGFzc0Zyb21TdHJpbmcoQCJOU1Rvb2xUaXBNYW5hZ2VyIik7CisgICAgICAgIH0pOworCisgICAg ICAgIGlkIG93bmVyID0gdHJhY2tpbmdBcmVhLm93bmVyOworICAgICAgICBpZiAoW293bmVyIGNs YXNzXSA9PSBtYW5hZ2VyQ2xhc3MpCisgICAgICAgICAgICByZXR1cm4gb3duZXI7CisgICAgfQor ICAgIHJldHVybiBuaWw7Cit9CisKIHZvaWQgV2ViVmlld0ltcGw6OnNlbmRUb29sVGlwTW91c2VF eGl0ZWQoKQogewogICAgIC8vIE5vdGhpbmcgbWF0dGVycyBleGNlcHQgd2luZG93LCB0cmFja2lu Z051bWJlciwgYW5kIHVzZXJEYXRhLgogICAgIE5TRXZlbnQgKmZha2VFdmVudCA9IFtOU0V2ZW50 IGVudGVyRXhpdEV2ZW50V2l0aFR5cGU6TlNFdmVudFR5cGVNb3VzZUV4aXRlZAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9jYXRpb246TlNNYWtlUG9p bnQoMCwgMCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtb2Rp ZmllckZsYWdzOjAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdGltZXN0YW1wOjAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgd2luZG93TnVtYmVyOlttX3ZpZXcgd2luZG93XS53aW5kb3dOdW1iZXIKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0Ok5VTEwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50TnVtYmVyOjAKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRyYWNraW5nTnVtYmVyOlRS QUNLSU5HX1JFQ1RfVEFHCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB1c2VyRGF0YTptX3RyYWNraW5nUmVjdFVzZXJEYXRhXTsKLSAgICBbbV90cmFja2lu Z1JlY3RPd25lciBtb3VzZUV4aXRlZDpmYWtlRXZlbnRdOworICAgICAgICBsb2NhdGlvbjpOU1pl cm9Qb2ludAorICAgICAgICBtb2RpZmllckZsYWdzOjAKKyAgICAgICAgdGltZXN0YW1wOjAKKyAg ICAgICAgd2luZG93TnVtYmVyOlttX3ZpZXcgd2luZG93XS53aW5kb3dOdW1iZXIKKyAgICAgICAg Y29udGV4dDpuaWwKKyAgICAgICAgZXZlbnROdW1iZXI6MAorICAgICAgICB0cmFja2luZ051bWJl cjpUUkFDS0lOR19SRUNUX1RBRworICAgICAgICB1c2VyRGF0YTptX3RyYWNraW5nUmVjdFVzZXJE YXRhXTsKKyAgICBbdG9vbFRpcE93bmVyRm9yU2VuZGluZ01vdXNlRXZlbnRzKCkgbW91c2VFeGl0 ZWQ6ZmFrZUV2ZW50XTsKIH0KIAogdm9pZCBXZWJWaWV3SW1wbDo6c2VuZFRvb2xUaXBNb3VzZUVu dGVyZWQoKQogewogICAgIC8vIE5vdGhpbmcgbWF0dGVycyBleGNlcHQgd2luZG93LCB0cmFja2lu Z051bWJlciwgYW5kIHVzZXJEYXRhLgogICAgIE5TRXZlbnQgKmZha2VFdmVudCA9IFtOU0V2ZW50 IGVudGVyRXhpdEV2ZW50V2l0aFR5cGU6TlNFdmVudFR5cGVNb3VzZUVudGVyZWQKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxvY2F0aW9uOk5TTWFrZVBv aW50KDAsIDApCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbW9k aWZpZXJGbGFnczowCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRpbWVzdGFtcDowCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHdpbmRvd051bWJlcjpbbV92aWV3IHdpbmRvd10ud2luZG93TnVtYmVyCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGV4dDpOVUxMCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBldmVudE51bWJlcjowCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cmFja2luZ051bWJlcjpU UkFDS0lOR19SRUNUX1RBRwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdXNlckRhdGE6bV90cmFja2luZ1JlY3RVc2VyRGF0YV07Ci0gICAgW21fdHJhY2tp bmdSZWN0T3duZXIgbW91c2VFbnRlcmVkOmZha2VFdmVudF07CisgICAgICAgIGxvY2F0aW9uOk5T WmVyb1BvaW50CisgICAgICAgIG1vZGlmaWVyRmxhZ3M6MAorICAgICAgICB0aW1lc3RhbXA6MAor ICAgICAgICB3aW5kb3dOdW1iZXI6W21fdmlldyB3aW5kb3ddLndpbmRvd051bWJlcgorICAgICAg ICBjb250ZXh0Om5pbAorICAgICAgICBldmVudE51bWJlcjowCisgICAgICAgIHRyYWNraW5nTnVt YmVyOlRSQUNLSU5HX1JFQ1RfVEFHCisgICAgICAgIHVzZXJEYXRhOm1fdHJhY2tpbmdSZWN0VXNl ckRhdGFdOworICAgIFt0b29sVGlwT3duZXJGb3JTZW5kaW5nTW91c2VFdmVudHMoKSBtb3VzZUVu dGVyZWQ6ZmFrZUV2ZW50XTsKIH0KIAogTlNTdHJpbmcgKldlYlZpZXdJbXBsOjpzdHJpbmdGb3JU b29sVGlwKE5TVG9vbFRpcFRhZyB0YWcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5 L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2Vi Vmlldy9XZWJIVE1MVmlldy5tbQppbmRleCA0ZWIzZjgzZDdkNmE5YzZkZjE5ZGJmNTM3OTI2OTFk OWU2NzE0ZDQ0Li44NzdmZjI4N2E3NmMzMTVmMTE5NzM5MWQyNmMwNGMzZWIyNWU2MDVhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCisr KyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KQEAgLTk0 OCw3ICs5NDgsNyBAQCBAcHVibGljCiAgICAgUmV0YWluUHRyPE5TU3RyaW5nPiB0b29sVGlwOwog ICAgIE5TVG9vbFRpcFRhZyBsYXN0VG9vbFRpcFRhZzsKIAotICAgIGlkIHRyYWNraW5nUmVjdE93 bmVyOworICAgIFdlYWtPYmpDUHRyPGlkPiB0cmFja2luZ1JlY3RPd25lcjsKICAgICB2b2lkKiB0 cmFja2luZ1JlY3RVc2VyRGF0YTsKICAgICAKICAgICBSZXRhaW5QdHI8TlNUaW1lcj4gYXV0b3Nj cm9sbFRpbWVyOwpAQCAtMTcxMyw3ICsxNzEzLDcgQEAgLSAoTlNWaWV3ICopaGl0VGVzdDooTlNQ b2ludClwb2ludAogCiAtIChOU1RyYWNraW5nUmVjdFRhZylhZGRUcmFja2luZ1JlY3Q6KE5TUmVj dClyZWN0IG93bmVyOihpZClvd25lciB1c2VyRGF0YToodm9pZCAqKWRhdGEgYXNzdW1lSW5zaWRl OihCT09MKWFzc3VtZUluc2lkZQogewotICAgIEFTU0VSVChfcHJpdmF0ZS0+dHJhY2tpbmdSZWN0 T3duZXIgPT0gbmlsKTsKKyAgICBBU1NFUlQoIV9wcml2YXRlLT50cmFja2luZ1JlY3RPd25lcik7 CiAgICAgX3ByaXZhdGUtPnRyYWNraW5nUmVjdE93bmVyID0gb3duZXI7CiAgICAgX3ByaXZhdGUt PnRyYWNraW5nUmVjdFVzZXJEYXRhID0gZGF0YTsKICAgICByZXR1cm4gVFJBQ0tJTkdfUkVDVF9U QUc7CkBAIC0xNzIyLDcgKzE3MjIsNyBAQCAtIChOU1RyYWNraW5nUmVjdFRhZylhZGRUcmFja2lu Z1JlY3Q6KE5TUmVjdClyZWN0IG93bmVyOihpZClvd25lciB1c2VyRGF0YToodm9pZAogLSAoTlNU cmFja2luZ1JlY3RUYWcpX2FkZFRyYWNraW5nUmVjdDooTlNSZWN0KXJlY3Qgb3duZXI6KGlkKW93 bmVyIHVzZXJEYXRhOih2b2lkICopZGF0YSBhc3N1bWVJbnNpZGU6KEJPT0wpYXNzdW1lSW5zaWRl IHVzZVRyYWNraW5nTnVtOihpbnQpdGFnCiB7CiAgICAgQVNTRVJUKHRhZyA9PSAwIHx8IHRhZyA9 PSBUUkFDS0lOR19SRUNUX1RBRyk7Ci0gICAgQVNTRVJUKF9wcml2YXRlLT50cmFja2luZ1JlY3RP d25lciA9PSBuaWwpOworICAgIEFTU0VSVCghX3ByaXZhdGUtPnRyYWNraW5nUmVjdE93bmVyKTsK ICAgICBfcHJpdmF0ZS0+dHJhY2tpbmdSZWN0T3duZXIgPSBvd25lcjsKICAgICBfcHJpdmF0ZS0+ dHJhY2tpbmdSZWN0VXNlckRhdGEgPSBkYXRhOwogICAgIHJldHVybiBUUkFDS0lOR19SRUNUX1RB RzsKQEAgLTE3MzIsNyArMTczMiw3IEBAIC0gKHZvaWQpX2FkZFRyYWNraW5nUmVjdHM6KE5TUmVj dCAqKXJlY3RzIG93bmVyOihpZClvd25lciB1c2VyRGF0YUxpc3Q6KHZvaWQgKiopCiB7CiAgICAg QVNTRVJUKGNvdW50ID09IDEpOwogICAgIEFTU0VSVCh0cmFja2luZ051bXNbMF0gPT0gMCB8fCB0 cmFja2luZ051bXNbMF0gPT0gVFJBQ0tJTkdfUkVDVF9UQUcpOwotICAgIEFTU0VSVChfcHJpdmF0 ZS0+dHJhY2tpbmdSZWN0T3duZXIgPT0gbmlsKTsKKyAgICBBU1NFUlQoIV9wcml2YXRlLT50cmFj a2luZ1JlY3RPd25lcik7CiAgICAgX3ByaXZhdGUtPnRyYWNraW5nUmVjdE93bmVyID0gb3duZXI7 CiAgICAgX3ByaXZhdGUtPnRyYWNraW5nUmVjdFVzZXJEYXRhID0gdXNlckRhdGFMaXN0WzBdOwog ICAgIHRyYWNraW5nTnVtc1swXSA9IFRSQUNLSU5HX1JFQ1RfVEFHOwpAQCAtMTc3Myw2ICsxNzcz LDI1IEBAIC0gKHZvaWQpX3JlbW92ZVRyYWNraW5nUmVjdHM6KE5TVHJhY2tpbmdSZWN0VGFnICop dGFncyBjb3VudDooaW50KWNvdW50CiAgICAgfQogfQogCistIChpZClfdG9vbFRpcE93bmVyRm9y U2VuZGluZ01vdXNlRXZlbnRzCit7CisgICAgaWYgKGlkIG93bmVyID0gX3ByaXZhdGUtPnRyYWNr aW5nUmVjdE93bmVyLmdldEF1dG9yZWxlYXNlZCgpKQorICAgICAgICByZXR1cm4gb3duZXI7CisK KyAgICBmb3IgKE5TVHJhY2tpbmdBcmVhICp0cmFja2luZ0FyZWEgaW4gc2VsZi50cmFja2luZ0Fy ZWFzKSB7CisgICAgICAgIHN0YXRpYyBDbGFzcyBtYW5hZ2VyQ2xhc3M7CisgICAgICAgIHN0YXRp YyBzdGQ6Om9uY2VfZmxhZyBvbmNlRmxhZzsKKyAgICAgICAgc3RkOjpjYWxsX29uY2Uob25jZUZs YWcsIFtdIHsKKyAgICAgICAgICAgIG1hbmFnZXJDbGFzcyA9IE5TQ2xhc3NGcm9tU3RyaW5nKEAi TlNUb29sVGlwTWFuYWdlciIpOworICAgICAgICB9KTsKKworICAgICAgICBpZCBvd25lciA9IHRy YWNraW5nQXJlYS5vd25lcjsKKyAgICAgICAgaWYgKFtvd25lciBjbGFzc10gPT0gbWFuYWdlckNs YXNzKQorICAgICAgICAgICAgcmV0dXJuIG93bmVyOworICAgIH0KKyAgICByZXR1cm4gbmlsOwor fQorCiAtICh2b2lkKV9zZW5kVG9vbFRpcE1vdXNlRXhpdGVkCiB7CiAgICAgLy8gTm90aGluZyBt YXR0ZXJzIGV4Y2VwdCB3aW5kb3csIHRyYWNraW5nTnVtYmVyLCBhbmQgdXNlckRhdGEuCkBAIC0x Nzg1LDcgKzE4MDQsNyBAQCAtICh2b2lkKV9zZW5kVG9vbFRpcE1vdXNlRXhpdGVkCiAgICAgICAg IGV2ZW50TnVtYmVyOjAKICAgICAgICAgdHJhY2tpbmdOdW1iZXI6VFJBQ0tJTkdfUkVDVF9UQUcK ICAgICAgICAgdXNlckRhdGE6X3ByaXZhdGUtPnRyYWNraW5nUmVjdFVzZXJEYXRhXTsKLSAgICBb X3ByaXZhdGUtPnRyYWNraW5nUmVjdE93bmVyIG1vdXNlRXhpdGVkOmZha2VFdmVudF07CisgICAg W3NlbGYuX3Rvb2xUaXBPd25lckZvclNlbmRpbmdNb3VzZUV2ZW50cyBtb3VzZUV4aXRlZDpmYWtl RXZlbnRdOwogfQogCiAtICh2b2lkKV9zZW5kVG9vbFRpcE1vdXNlRW50ZXJlZApAQCAtMTgwMCw3 ICsxODE5LDcgQEAgLSAodm9pZClfc2VuZFRvb2xUaXBNb3VzZUVudGVyZWQKICAgICAgICAgZXZl bnROdW1iZXI6MAogICAgICAgICB0cmFja2luZ051bWJlcjpUUkFDS0lOR19SRUNUX1RBRwogICAg ICAgICB1c2VyRGF0YTpfcHJpdmF0ZS0+dHJhY2tpbmdSZWN0VXNlckRhdGFdOwotICAgIFtfcHJp dmF0ZS0+dHJhY2tpbmdSZWN0T3duZXIgbW91c2VFbnRlcmVkOmZha2VFdmVudF07CisgICAgW3Nl bGYuX3Rvb2xUaXBPd25lckZvclNlbmRpbmdNb3VzZUV2ZW50cyBtb3VzZUVudGVyZWQ6ZmFrZUV2 ZW50XTsKIH0KIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykK