188756 2018-08-20 13:37:27 -0700 Remove experimental affiliated domain code now that StorageAccess API is available 2018-08-21 13:37:34 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 174661 1 bfulgham bfulgham achristensen bfulgham cdumez dbates ews-watchlist japhet webkit-bug-importer wilander oldest_to_newest 1451714 0 bfulgham 2018-08-20 13:37:27 -0700 In Bug 174661 we added a compatibility quirk to support wsj.com authentication. This quirk is no longer needed, since the StorageAccess API provides the necessary tools to do this type of interaction without needing global cross-site access. 1451746 1 bfulgham 2018-08-20 14:30:56 -0700 <rdar://problem/43527848> 1451749 2 347546 bfulgham 2018-08-20 14:33:59 -0700 Created attachment 347546 Patch 1451849 3 347576 bfulgham 2018-08-20 17:11:46 -0700 Created attachment 347576 Patch 1452116 4 347648 bfulgham 2018-08-21 09:28:51 -0700 Created attachment 347648 Patch 1452145 5 wilander 2018-08-21 10:26:05 -0700 Mac debug test failures are unrelated. 1452147 6 bfulgham 2018-08-21 10:26:43 -0700 Despite Alex's r+, I think I made a mistake. I'll upload a revised version. 1452148 7 wilander 2018-08-21 10:28:45 -0700 You probably want to merge with the queued patch from https://bugs.webkit.org/show_bug.cgi?id=188757 or rebase when it's landed. 1452158 8 347659 bfulgham 2018-08-21 10:45:24 -0700 Created attachment 347659 Patch 1452181 9 347664 bfulgham 2018-08-21 11:40:54 -0700 Created attachment 347664 Patch 1452182 10 bfulgham 2018-08-21 11:41:33 -0700 Revised patch merged with current ToT uploaded. Ready for a new review! 1452217 11 347664 wilander 2018-08-21 13:10:57 -0700 Comment on attachment 347664 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=347664&action=review Looks good to me. > Source/WebCore/loader/ResourceLoadObserver.cpp:150 > + Ah, this is a fix of the comparison that was lost when I removed the call to areDomainsAssociated(). Good catch. > Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp:611 > + I see, you moved the previous check in WebResourceLoadStatisticsStore's areDomainsAssociated() into here. 1452240 12 bfulgham 2018-08-21 13:37:34 -0700 Committed r235132: <https://trac.webkit.org/changeset/235132> 347546 2018-08-20 14:33:59 -0700 2018-08-20 17:11:44 -0700 Patch bug-188756-20180820143358.patch text/plain 6497 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQ1YzhmN2NkOGU4OGU1 NDAyZjVjODM0NjMxM2UyZTFkOTU5MTVhYS4uMDc5YmZkMzRiYTMyNzU2OTBjODY0YTY3YjE3YmY2 YTI3ZDM0OWVhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA4LTIwICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBleHBlcmlt ZW50YWwgYWZmaWxpYXRlZCBkb21haW4gY29kZSBub3cgdGhhdCBTdG9yYWdlQWNjZXNzIEFQSSBp cyBhdmFpbGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4ODc1NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDM1Mjc4NDg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gQnVnIDE3NDY2MSB3ZSBh ZGRlZCBhIGNvbXBhdGliaWxpdHkgcXVpcmsgdG8gc3VwcG9ydCB3c2ouY29tIGF1dGhlbnRpY2F0 aW9uLiBUaGlzIHF1aXJrIGlzIG5vIGxvbmdlciBuZWVkZWQsCisgICAgICAgIHNpbmNlIHRoZSBT dG9yYWdlQWNjZXNzIEFQSSBwcm92aWRlcyB0aGUgbmVjZXNzYXJ5IHRvb2xzIHRvIGRvIHRoaXMg dHlwZSBvZiBpbnRlcmFjdGlvbiB3aXRob3V0IG5lZWRpbmcgZ2xvYmFsCisgICAgICAgIGNyb3Nz LXNpdGUgYWNjZXNzLgorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJj ZUxvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1dl YlNvY2tldExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6YXJlRG9tYWluc0Fzc29jaWF0ZWQp OiBEZWxldGVkLgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmFyZURvbWFpbnNBc3Nv Y2lhdGVkKTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGlj cy5oOgorCiAyMDE4LTA4LTIwICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAK ICAgICAgICAgUkVHUkVTU0lPTiAocjIyMzE5Mik6IFJlbW92ZSBpbnZhbGlkIGBwYXRoYCBmb3Ig TW9kdWxlcy9nZW9sb2NhdGlvbi9pb3MgZm9sZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcAppbmRleCA1MTFiOTEyYTI1NDBjMzkyNjMwNGFiZWRj YjhlYzA0NTQwMjE3MDkyLi45NjU1NTdkMDkyMzQ1MGYwODc3YmM4YWFhY2FkYzNmYjQ3NWFiYzg1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAK QEAgLTY4LDExICs2OCw2IEBAIHN0YXRpYyBib29sIHNob3VsZEVuYWJsZVNpdGVTcGVjaWZpY1F1 aXJrcyhQYWdlKiBwYWdlKQogI2VuZGlmCiB9CiAKLXN0YXRpYyBib29sIGFyZURvbWFpbnNBc3Nv Y2lhdGVkKFBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmluZyYgZmlyc3REb21haW4sIGNvbnN0IFN0cmlu ZyYgc2Vjb25kRG9tYWluKQotewotICAgIHJldHVybiBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjph cmVEb21haW5zQXNzb2NpYXRlZChzaG91bGRFbmFibGVTaXRlU3BlY2lmaWNRdWlya3MocGFnZSks IGZpcnN0RG9tYWluLCBzZWNvbmREb21haW4pOwotfQotCiB2b2lkIFJlc291cmNlTG9hZE9ic2Vy dmVyOjpzZXROb3RpZmljYXRpb25DYWxsYmFjayhXVEY6OkZ1bmN0aW9uPHZvaWQgKFZlY3RvcjxS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzPiYmKT4mJiBub3RpZmljYXRpb25DYWxsYmFjaykKIHsKICAg ICBBU1NFUlQoIW1fbm90aWZpY2F0aW9uQ2FsbGJhY2spOwpAQCAtMTI3LDkgKzEyMiw2IEBAIHZv aWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1N1YnJlc291cmNlTG9hZGluZyhjb25zdCBGcmFt ZSogZnJhbWUsIGNvbnN0IFJlc291CiAgICAgYXV0byBtYWluRnJhbWVQcmltYXJ5RG9tYWluID0g cHJpbWFyeURvbWFpbihtYWluRnJhbWVVUkwpOwogICAgIGF1dG8gc291cmNlUHJpbWFyeURvbWFp biA9IHByaW1hcnlEb21haW4oc291cmNlVVJMKTsKICAgICAKLSAgICBpZiAoYXJlRG9tYWluc0Fz c29jaWF0ZWQocGFnZSwgdGFyZ2V0UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1lUHJpbWFyeURvbWFp bikgfHwgKGlzUmVkaXJlY3QgJiYgYXJlRG9tYWluc0Fzc29jaWF0ZWQocGFnZSwgdGFyZ2V0UHJp bWFyeURvbWFpbiwgc291cmNlUHJpbWFyeURvbWFpbikpKQotICAgICAgICByZXR1cm47Ci0KICAg ICBib29sIHNob3VsZENhbGxOb3RpZmljYXRpb25DYWxsYmFjayA9IGZhbHNlOwogICAgIHsKICAg ICAgICAgYXV0byYgdGFyZ2V0U3RhdGlzdGljcyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0Zv clByaW1hcnlEb21haW4odGFyZ2V0UHJpbWFyeURvbWFpbik7CkBAIC0xNzQsOSArMTY2LDYgQEAg dm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nV2ViU29ja2V0TG9hZGluZyhjb25zdCBGcmFt ZSogZnJhbWUsIGNvbnN0IFVSTCYgdGEKICAgICBhdXRvIHRhcmdldFByaW1hcnlEb21haW4gPSBw cmltYXJ5RG9tYWluKHRhcmdldFVSTCk7CiAgICAgYXV0byBtYWluRnJhbWVQcmltYXJ5RG9tYWlu ID0gcHJpbWFyeURvbWFpbihtYWluRnJhbWVVUkwpOwogICAgIAotICAgIGlmIChhcmVEb21haW5z QXNzb2NpYXRlZChwYWdlLCB0YXJnZXRQcmltYXJ5RG9tYWluLCBtYWluRnJhbWVQcmltYXJ5RG9t YWluKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgYXV0byYgdGFyZ2V0U3RhdGlzdGljcyA9IGVu c3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4odGFyZ2V0UHJpbWFyeURvbWFp bik7CiAgICAgdGFyZ2V0U3RhdGlzdGljcy5sYXN0U2VlbiA9IFJlc291cmNlTG9hZFN0YXRpc3Rp Y3M6OnJlZHVjZVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lOjpub3coKSk7CiAgICAgaWYgKHRhcmdl dFN0YXRpc3RpY3Muc3VicmVzb3VyY2VVbmRlclRvcEZyYW1lT3JpZ2lucy5hZGQobWFpbkZyYW1l UHJpbWFyeURvbWFpbikuaXNOZXdFbnRyeSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9S ZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmNwcAppbmRleCBkNzU2MzljNjJjMDM4NWU2NTVjNmI5MWQ5 ZTljZGYwNzQ4NDQzYWY0Li45ZTJiN2NmMzE1MTljZWIzODU2YzM4NjE2Yzc1NzIwNzI0ZjcwZWRl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGlj cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3Mu Y3BwCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNi0yMDE3IEFwcGxl IEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTYtMjAxOCBB cHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zCkBAIC0zNTMsNDAgKzM1Myw2IEBAIFN0cmluZyBSZXNvdXJjZUxvYWRTdGF0aXN0aWNz OjpwcmltYXJ5RG9tYWluKFN0cmluZ1ZpZXcgaG9zdCkKICAgICByZXR1cm4gaG9zdFN0cmluZzsK IH0KIAotLy8gRklYTUU6IFRlbXBvcmFyeSBmaXggZm9yIDxyZGFyOi8vcHJvYmxlbS8zMjM0MzI1 Nj4gdW50aWwgY29udGVudCBjYW4gYmUgdXBkYXRlZC4KLWJvb2wgUmVzb3VyY2VMb2FkU3RhdGlz dGljczo6YXJlRG9tYWluc0Fzc29jaWF0ZWQoYm9vbCBuZWVkc1NpdGVTcGVjaWZpY1F1aXJrcywg Y29uc3QgU3RyaW5nJiBmaXJzdERvbWFpbiwgY29uc3QgU3RyaW5nJiBzZWNvbmREb21haW4pCi17 Ci0gICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLQotICAgIHN0YXRpYyBOZXZlckRlc3Ryb3ll ZDxIYXNoTWFwPFN0cmluZywgdW5zaWduZWQ+PiBtZXRhRG9tYWluSWRlbnRpZmllcnMgPSBbXSB7 Ci0gICAgICAgIEhhc2hNYXA8U3RyaW5nLCB1bnNpZ25lZD4gbWFwOwotCi0gICAgICAgIC8vIERv bWFpbnMgb3duZWQgYnkgRG93IEpvbmVzICYgQ29tcGFueSwgSW5jLgotICAgICAgICBjb25zdCB1 bnNpZ25lZCBkb3dKb25lc0lkZW50aWZpZXIgPSAxOwotICAgICAgICBtYXAuYWRkKCJkb3dqb25l cy5jb20iX3MsIGRvd0pvbmVzSWRlbnRpZmllcik7Ci0gICAgICAgIG1hcC5hZGQoIndzai5jb20i X3MsIGRvd0pvbmVzSWRlbnRpZmllcik7Ci0gICAgICAgIG1hcC5hZGQoImJhcnJvbnMuY29tIl9z LCBkb3dKb25lc0lkZW50aWZpZXIpOwotICAgICAgICBtYXAuYWRkKCJtYXJrZXR3YXRjaC5jb20i X3MsIGRvd0pvbmVzSWRlbnRpZmllcik7Ci0gICAgICAgIG1hcC5hZGQoIndzanBsdXMuY29tIl9z LCBkb3dKb25lc0lkZW50aWZpZXIpOwotCi0gICAgICAgIHJldHVybiBtYXA7Ci0gICAgfSgpOwot Ci0gICAgaWYgKGZpcnN0RG9tYWluID09IHNlY29uZERvbWFpbikKLSAgICAgICAgcmV0dXJuIHRy dWU7Ci0KLSAgICBBU1NFUlQoIWVxdWFsSWdub3JpbmdBU0NJSUNhc2UoZmlyc3REb21haW4sIHNl Y29uZERvbWFpbikpOwotCi0gICAgaWYgKCFuZWVkc1NpdGVTcGVjaWZpY1F1aXJrcykKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwotCi0gICAgdW5zaWduZWQgZmlyc3RNZXRhRG9tYWluSWRlbnRpZmll ciA9IG1ldGFEb21haW5JZGVudGlmaWVycy5nZXQoKS5nZXQoZmlyc3REb21haW4pOwotICAgIGlm ICghZmlyc3RNZXRhRG9tYWluSWRlbnRpZmllcikKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0g ICAgcmV0dXJuIGZpcnN0TWV0YURvbWFpbklkZW50aWZpZXIgPT0gbWV0YURvbWFpbklkZW50aWZp ZXJzLmdldCgpLmdldChzZWNvbmREb21haW4pOwotfQotCiBXYWxsVGltZSBSZXNvdXJjZUxvYWRT dGF0aXN0aWNzOjpyZWR1Y2VUaW1lUmVzb2x1dGlvbihXYWxsVGltZSB0aW1lKQogewogICAgIHJl dHVybiBXYWxsVGltZTo6ZnJvbVJhd1NlY29uZHMoc3RkOjpmbG9vcih0aW1lLnNlY29uZHNTaW5j ZUVwb2NoKCkgLyB0aW1lc3RhbXBSZXNvbHV0aW9uKSAqIHRpbWVzdGFtcFJlc29sdXRpb24uc2Vj b25kcygpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRT dGF0aXN0aWNzLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGlj cy5oCmluZGV4IGViOWM3YjY5MDY0OTNkZDllNzhiNDVkOGMxYjg3ZTc0MzFkOWIwMzMuLjhjOWVk NGMyYmExZmIzNGE1OWI2MzIyZDliZWViYWZmODNiNjJkNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuaApAQCAtMSw1ICsxLDUgQEAKIC8qCi0g KiBDb3B5cmlnaHQgKEMpIDIwMTYtMjAxNyBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVk LgorICogQ29weXJpZ2h0IChDKSAyMDE2LTIwMTggQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNl cnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNTMsNyArNTMsNiBAQCBz dHJ1Y3QgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyB7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGlj IFN0cmluZyBwcmltYXJ5RG9tYWluKGNvbnN0IFVSTCYpOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0 YXRpYyBTdHJpbmcgcHJpbWFyeURvbWFpbihTdHJpbmdWaWV3IGhvc3QpOwogCi0gICAgV0VCQ09S RV9FWFBPUlQgc3RhdGljIGJvb2wgYXJlRG9tYWluc0Fzc29jaWF0ZWQoYm9vbCBuZWVkc1NpdGVT cGVjaWZpY1F1aXJrcywgY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJik7CiAgICAgV0VCQ09S RV9FWFBPUlQgc3RhdGljIFdhbGxUaW1lIHJlZHVjZVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lKTsK IAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZW5jb2RlKEtleWVkRW5jb2RlciYpIGNvbnN0Owo= 347576 2018-08-20 17:11:46 -0700 2018-08-21 09:28:49 -0700 Patch bug-188756-20180820171145.patch text/plain 6937 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQ1YzhmN2NkOGU4OGU1 NDAyZjVjODM0NjMxM2UyZTFkOTU5MTVhYS4uNTJjODc3MTdlN2EyZDRlMzc5YzBjYzJlZmQ1N2Vm NjQ4YTJjOThlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA4LTIwICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBleHBlcmlt ZW50YWwgYWZmaWxpYXRlZCBkb21haW4gY29kZSBub3cgdGhhdCBTdG9yYWdlQWNjZXNzIEFQSSBp cyBhdmFpbGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4ODc1NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDM1Mjc4NDg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gQnVnIDE3NDY2MSB3ZSBh ZGRlZCBhIGNvbXBhdGliaWxpdHkgcXVpcmsgdG8gc3VwcG9ydCB3c2ouY29tIGF1dGhlbnRpY2F0 aW9uLiBUaGlzIHF1aXJrIGlzIG5vIGxvbmdlciBuZWVkZWQsCisgICAgICAgIHNpbmNlIHRoZSBT dG9yYWdlQWNjZXNzIEFQSSBwcm92aWRlcyB0aGUgbmVjZXNzYXJ5IHRvb2xzIHRvIGRvIHRoaXMg dHlwZSBvZiBpbnRlcmFjdGlvbiB3aXRob3V0IG5lZWRpbmcgZ2xvYmFsCisgICAgICAgIGNyb3Nz LXNpdGUgYWNjZXNzLgorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJj ZUxvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1dl YlNvY2tldExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6YXJlRG9tYWluc0Fzc29jaWF0ZWQp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkRW5hYmxlU2l0ZVNwZWNpZmljUXVp cmtzKTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjphcmVEb21haW5z QXNzb2NpYXRlZCk6IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3MuaDoKKwogMjAxOC0wOC0yMCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t PgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyMjMxOTIpOiBSZW1vdmUgaW52YWxpZCBgcGF0aGAg Zm9yIE1vZHVsZXMvZ2VvbG9jYXRpb24vaW9zIGZvbGRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAKaW5kZXggNTExYjkxMmEyNTQwYzM5MjYzMDRh YmVkY2I4ZWMwNDU0MDIxNzA5Mi4uMzdmM2FlN2E2NmE4MWFkOTI5MmQ5YjM0ZGM1ZmIxNDgzNTcw NjUxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2Vy dmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIu Y3BwCkBAIC01NSwyNCArNTUsNiBAQCBSZXNvdXJjZUxvYWRPYnNlcnZlciYgUmVzb3VyY2VMb2Fk T2JzZXJ2ZXI6OnNoYXJlZCgpCiAgICAgcmV0dXJuIHJlc291cmNlTG9hZE9ic2VydmVyOwogfQog Ci1zdGF0aWMgYm9vbCBzaG91bGRFbmFibGVTaXRlU3BlY2lmaWNRdWlya3MoUGFnZSogcGFnZSkK LXsKLSNpZiBQTEFURk9STShJT1MpCi0gICAgVU5VU0VEX1BBUkFNKHBhZ2UpOwotCi0gICAgLy8g VGhlcmUgaXMgY3VycmVudGx5IG5vIHdheSB0byB0b2dnbGUgdGhlIG5lZWRzU2l0ZVNwZWNpZmlj UXVpcmtzIHNldHRpbmcgb24gaU9TIHNvIHdlIGFsd2F5cyBlbmFibGUKLSAgICAvLyB0aGUgc2l0 ZS1zcGVjaWZpYyBxdWlya3Mgb24gaU9TLgotICAgIHJldHVybiB0cnVlOwotI2Vsc2UKLSAgICBy ZXR1cm4gcGFnZSAmJiBwYWdlLT5zZXR0aW5ncygpLm5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzKCk7 Ci0jZW5kaWYKLX0KLQotc3RhdGljIGJvb2wgYXJlRG9tYWluc0Fzc29jaWF0ZWQoUGFnZSogcGFn ZSwgY29uc3QgU3RyaW5nJiBmaXJzdERvbWFpbiwgY29uc3QgU3RyaW5nJiBzZWNvbmREb21haW4p Ci17Ci0gICAgcmV0dXJuIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmFyZURvbWFpbnNBc3NvY2lh dGVkKHNob3VsZEVuYWJsZVNpdGVTcGVjaWZpY1F1aXJrcyhwYWdlKSwgZmlyc3REb21haW4sIHNl Y29uZERvbWFpbik7Ci19Ci0KIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNldE5vdGlmaWNh dGlvbkNhbGxiYWNrKFdURjo6RnVuY3Rpb248dm9pZCAoVmVjdG9yPFJlc291cmNlTG9hZFN0YXRp c3RpY3M+JiYpPiYmIG5vdGlmaWNhdGlvbkNhbGxiYWNrKQogewogICAgIEFTU0VSVCghbV9ub3Rp ZmljYXRpb25DYWxsYmFjayk7CkBAIC0xMjcsOSArMTA5LDYgQEAgdm9pZCBSZXNvdXJjZUxvYWRP YnNlcnZlcjo6bG9nU3VicmVzb3VyY2VMb2FkaW5nKGNvbnN0IEZyYW1lKiBmcmFtZSwgY29uc3Qg UmVzb3UKICAgICBhdXRvIG1haW5GcmFtZVByaW1hcnlEb21haW4gPSBwcmltYXJ5RG9tYWluKG1h aW5GcmFtZVVSTCk7CiAgICAgYXV0byBzb3VyY2VQcmltYXJ5RG9tYWluID0gcHJpbWFyeURvbWFp bihzb3VyY2VVUkwpOwogICAgIAotICAgIGlmIChhcmVEb21haW5zQXNzb2NpYXRlZChwYWdlLCB0 YXJnZXRQcmltYXJ5RG9tYWluLCBtYWluRnJhbWVQcmltYXJ5RG9tYWluKSB8fCAoaXNSZWRpcmVj dCAmJiBhcmVEb21haW5zQXNzb2NpYXRlZChwYWdlLCB0YXJnZXRQcmltYXJ5RG9tYWluLCBzb3Vy Y2VQcmltYXJ5RG9tYWluKSkpCi0gICAgICAgIHJldHVybjsKLQogICAgIGJvb2wgc2hvdWxkQ2Fs bE5vdGlmaWNhdGlvbkNhbGxiYWNrID0gZmFsc2U7CiAgICAgewogICAgICAgICBhdXRvJiB0YXJn ZXRTdGF0aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbih0 YXJnZXRQcmltYXJ5RG9tYWluKTsKQEAgLTE3NCw5ICsxNTMsNiBAQCB2b2lkIFJlc291cmNlTG9h ZE9ic2VydmVyOjpsb2dXZWJTb2NrZXRMb2FkaW5nKGNvbnN0IEZyYW1lKiBmcmFtZSwgY29uc3Qg VVJMJiB0YQogICAgIGF1dG8gdGFyZ2V0UHJpbWFyeURvbWFpbiA9IHByaW1hcnlEb21haW4odGFy Z2V0VVJMKTsKICAgICBhdXRvIG1haW5GcmFtZVByaW1hcnlEb21haW4gPSBwcmltYXJ5RG9tYWlu KG1haW5GcmFtZVVSTCk7CiAgICAgCi0gICAgaWYgKGFyZURvbWFpbnNBc3NvY2lhdGVkKHBhZ2Us IHRhcmdldFByaW1hcnlEb21haW4sIG1haW5GcmFtZVByaW1hcnlEb21haW4pKQotICAgICAgICBy ZXR1cm47Ci0KICAgICBhdXRvJiB0YXJnZXRTdGF0aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0 aXN0aWNzRm9yUHJpbWFyeURvbWFpbih0YXJnZXRQcmltYXJ5RG9tYWluKTsKICAgICB0YXJnZXRT dGF0aXN0aWNzLmxhc3RTZWVuID0gUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6cmVkdWNlVGltZVJl c29sdXRpb24oV2FsbFRpbWU6Om5vdygpKTsKICAgICBpZiAodGFyZ2V0U3RhdGlzdGljcy5zdWJy ZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zLmFkZChtYWluRnJhbWVQcmltYXJ5RG9tYWluKS5p c05ld0VudHJ5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9h ZFN0YXRpc3RpY3MuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3MuY3BwCmluZGV4IGQ3NTYzOWM2MmMwMzg1ZTY1NWM2YjkxZDllOWNkZjA3NDg0NDNhZjQu LjllMmI3Y2YzMTUxOWNlYjM4NTZjMzg2MTZjNzU3MjA3MjRmNzBlZGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5jcHAKQEAgLTEsNSArMSw1 IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE2LTIwMTcgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNi0yMDE4IEFwcGxlIEluYy4gIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM1Myw0 MCArMzUzLDYgQEAgU3RyaW5nIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OnByaW1hcnlEb21haW4o U3RyaW5nVmlldyBob3N0KQogICAgIHJldHVybiBob3N0U3RyaW5nOwogfQogCi0vLyBGSVhNRTog VGVtcG9yYXJ5IGZpeCBmb3IgPHJkYXI6Ly9wcm9ibGVtLzMyMzQzMjU2PiB1bnRpbCBjb250ZW50 IGNhbiBiZSB1cGRhdGVkLgotYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjphcmVEb21haW5z QXNzb2NpYXRlZChib29sIG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzLCBjb25zdCBTdHJpbmcmIGZp cnN0RG9tYWluLCBjb25zdCBTdHJpbmcmIHNlY29uZERvbWFpbikKLXsKLSAgICBBU1NFUlQoaXNN YWluVGhyZWFkKCkpOwotCi0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hNYXA8U3RyaW5n LCB1bnNpZ25lZD4+IG1ldGFEb21haW5JZGVudGlmaWVycyA9IFtdIHsKLSAgICAgICAgSGFzaE1h cDxTdHJpbmcsIHVuc2lnbmVkPiBtYXA7Ci0KLSAgICAgICAgLy8gRG9tYWlucyBvd25lZCBieSBE b3cgSm9uZXMgJiBDb21wYW55LCBJbmMuCi0gICAgICAgIGNvbnN0IHVuc2lnbmVkIGRvd0pvbmVz SWRlbnRpZmllciA9IDE7Ci0gICAgICAgIG1hcC5hZGQoImRvd2pvbmVzLmNvbSJfcywgZG93Sm9u ZXNJZGVudGlmaWVyKTsKLSAgICAgICAgbWFwLmFkZCgid3NqLmNvbSJfcywgZG93Sm9uZXNJZGVu dGlmaWVyKTsKLSAgICAgICAgbWFwLmFkZCgiYmFycm9ucy5jb20iX3MsIGRvd0pvbmVzSWRlbnRp Zmllcik7Ci0gICAgICAgIG1hcC5hZGQoIm1hcmtldHdhdGNoLmNvbSJfcywgZG93Sm9uZXNJZGVu dGlmaWVyKTsKLSAgICAgICAgbWFwLmFkZCgid3NqcGx1cy5jb20iX3MsIGRvd0pvbmVzSWRlbnRp Zmllcik7Ci0KLSAgICAgICAgcmV0dXJuIG1hcDsKLSAgICB9KCk7Ci0KLSAgICBpZiAoZmlyc3RE b21haW4gPT0gc2Vjb25kRG9tYWluKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgIEFTU0VS VCghZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShmaXJzdERvbWFpbiwgc2Vjb25kRG9tYWluKSk7Ci0K LSAgICBpZiAoIW5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0KLSAgICB1bnNpZ25lZCBmaXJzdE1ldGFEb21haW5JZGVudGlmaWVyID0gbWV0YURvbWFpbklk ZW50aWZpZXJzLmdldCgpLmdldChmaXJzdERvbWFpbik7Ci0gICAgaWYgKCFmaXJzdE1ldGFEb21h aW5JZGVudGlmaWVyKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICByZXR1cm4gZmlyc3RN ZXRhRG9tYWluSWRlbnRpZmllciA9PSBtZXRhRG9tYWluSWRlbnRpZmllcnMuZ2V0KCkuZ2V0KHNl Y29uZERvbWFpbik7Ci19Ci0KIFdhbGxUaW1lIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OnJlZHVj ZVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lIHRpbWUpCiB7CiAgICAgcmV0dXJuIFdhbGxUaW1lOjpm cm9tUmF3U2Vjb25kcyhzdGQ6OmZsb29yKHRpbWUuc2Vjb25kc1NpbmNlRXBvY2goKSAvIHRpbWVz dGFtcFJlc29sdXRpb24pICogdGltZXN0YW1wUmVzb2x1dGlvbi5zZWNvbmRzKCkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuaCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmgKaW5kZXggZWI5Yzdi NjkwNjQ5M2RkOWU3OGI0NWQ4YzFiODdlNzQzMWQ5YjAzMy4uOGM5ZWQ0YzJiYTFmYjM0YTU5YjYz MjJkOWJlZWJhZmY4M2I2MmQ0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZFN0YXRpc3RpY3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkU3RhdGlzdGljcy5oCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykg MjAxNi0yMDE3IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQg KEMpIDIwMTYtMjAxOCBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC01Myw3ICs1Myw2IEBAIHN0cnVjdCBSZXNvdXJjZUxv YWRTdGF0aXN0aWNzIHsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgU3RyaW5nIHByaW1hcnlE b21haW4oY29uc3QgVVJMJik7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFN0cmluZyBwcmlt YXJ5RG9tYWluKFN0cmluZ1ZpZXcgaG9zdCk7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMg Ym9vbCBhcmVEb21haW5zQXNzb2NpYXRlZChib29sIG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzLCBj b25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMg V2FsbFRpbWUgcmVkdWNlVGltZVJlc29sdXRpb24oV2FsbFRpbWUpOwogCiAgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCBlbmNvZGUoS2V5ZWRFbmNvZGVyJikgY29uc3Q7Cg== 347648 2018-08-21 09:28:51 -0700 2018-08-21 10:45:23 -0700 Patch bug-188756-20180821092850.patch text/plain 14728 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQxNDExYjA3ZDY2ZTcy OWNmNWIwMWM0MzkwMGI3NmJlNzkyMDgxMi4uOGM2YTdiZGI0YzdkNGYxZDYyZWVmNTExMDVlYTcz YzMyNzViOTA0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA4LTIxICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBleHBlcmlt ZW50YWwgYWZmaWxpYXRlZCBkb21haW4gY29kZSBub3cgdGhhdCBTdG9yYWdlQWNjZXNzIEFQSSBp cyBhdmFpbGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4ODc1NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDM1Mjc4NDg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gQnVnIDE3NDY2MSB3ZSBh ZGRlZCBhIGNvbXBhdGliaWxpdHkgcXVpcmsgdG8gc3VwcG9ydCB3c2ouY29tIGF1dGhlbnRpY2F0 aW9uLiBUaGlzIHF1aXJrIGlzIG5vIGxvbmdlciBuZWVkZWQsCisgICAgICAgIHNpbmNlIHRoZSBT dG9yYWdlQWNjZXNzIEFQSSBwcm92aWRlcyB0aGUgbmVjZXNzYXJ5IHRvb2xzIHRvIGRvIHRoaXMg dHlwZSBvZiBpbnRlcmFjdGlvbiB3aXRob3V0IG5lZWRpbmcgZ2xvYmFsCisgICAgICAgIGNyb3Nz LXNpdGUgYWNjZXNzLgorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJj ZUxvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1dl YlNvY2tldExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6YXJlRG9tYWluc0Fzc29jaWF0ZWQp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkRW5hYmxlU2l0ZVNwZWNpZmljUXVp cmtzKTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjphcmVEb21haW5z QXNzb2NpYXRlZCk6IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3MuaDoKKwogMjAxOC0wOC0yMSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KIAogICAgICAgICBEb24ndCBwbGFjZSAidXNpbmcgbmFtZXNwYWNlIFhYWDsiIGlu IGdsb2JhbCBzcGFjZSBmb3IgdW5pZmllZCBzb3VyY2UgYnVpbGRzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ3ZDIz ZGFiYjhhMzRhYTkzMmE1ZGQ2MzE5YmNmZmJiYTFhNzgzOGQuLjI4MGNhYjIyNTA4N2E5ZGRhNzg2 NWE3NjI0ZmY0MTIzNDc4NzdjYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTgtMDgt MjEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3Zl IGV4cGVyaW1lbnRhbCBhZmZpbGlhdGVkIGRvbWFpbiBjb2RlIG5vdyB0aGF0IFN0b3JhZ2VBY2Nl c3MgQVBJIGlzIGF2YWlsYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTg4NzU2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MzUyNzg0OD4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBCdWcgMTc0 NjYxIHdlIGFkZGVkIGEgY29tcGF0aWJpbGl0eSBxdWlyayB0byBzdXBwb3J0IHdzai5jb20gYXV0 aGVudGljYXRpb24uIFRoaXMgcXVpcmsgaXMgbm8gbG9uZ2VyIG5lZWRlZCwKKyAgICAgICAgc2lu Y2UgdGhlIFN0b3JhZ2VBY2Nlc3MgQVBJIHByb3ZpZGVzIHRoZSBuZWNlc3NhcnkgdG9vbHMgdG8g ZG8gdGhpcyB0eXBlIG9mIGludGVyYWN0aW9uIHdpdGhvdXQgbmVlZGluZyBnbG9iYWwKKyAgICAg ICAgY3Jvc3Mtc2l0ZSBhY2Nlc3MuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVzb3VyY2VMb2Fk U3RhdGlzdGljc01lbW9yeVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2Fk U3RhdGlzdGljc01lbW9yeVN0b3JlOjpsb2dGcmFtZU5hdmlnYXRpb24pOgorICAgICAgICAqIFVJ UHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpsb2dGcmFtZU5hdmlnYXRpb24p OgorICAgICAgICAoV2ViS2l0OjphcmVEb21haW5zQXNzb2NpYXRlZCk6IERlbGV0ZWQuCisKIDIw MTgtMDgtMjEgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMzQ5ODEuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcAppbmRleCA1MTFiOTEyYTI1NDBjMzkyNjMw NGFiZWRjYjhlYzA0NTQwMjE3MDkyLi4zN2YzYWU3YTY2YTgxYWQ5MjkyZDliMzRkYzVmYjE0ODM1 NzA2NTFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2Jz ZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZl ci5jcHAKQEAgLTU1LDI0ICs1NSw2IEBAIFJlc291cmNlTG9hZE9ic2VydmVyJiBSZXNvdXJjZUxv YWRPYnNlcnZlcjo6c2hhcmVkKCkKICAgICByZXR1cm4gcmVzb3VyY2VMb2FkT2JzZXJ2ZXI7CiB9 CiAKLXN0YXRpYyBib29sIHNob3VsZEVuYWJsZVNpdGVTcGVjaWZpY1F1aXJrcyhQYWdlKiBwYWdl KQotewotI2lmIFBMQVRGT1JNKElPUykKLSAgICBVTlVTRURfUEFSQU0ocGFnZSk7Ci0KLSAgICAv LyBUaGVyZSBpcyBjdXJyZW50bHkgbm8gd2F5IHRvIHRvZ2dsZSB0aGUgbmVlZHNTaXRlU3BlY2lm aWNRdWlya3Mgc2V0dGluZyBvbiBpT1Mgc28gd2UgYWx3YXlzIGVuYWJsZQotICAgIC8vIHRoZSBz aXRlLXNwZWNpZmljIHF1aXJrcyBvbiBpT1MuCi0gICAgcmV0dXJuIHRydWU7Ci0jZWxzZQotICAg IHJldHVybiBwYWdlICYmIHBhZ2UtPnNldHRpbmdzKCkubmVlZHNTaXRlU3BlY2lmaWNRdWlya3Mo KTsKLSNlbmRpZgotfQotCi1zdGF0aWMgYm9vbCBhcmVEb21haW5zQXNzb2NpYXRlZChQYWdlKiBw YWdlLCBjb25zdCBTdHJpbmcmIGZpcnN0RG9tYWluLCBjb25zdCBTdHJpbmcmIHNlY29uZERvbWFp bikKLXsKLSAgICByZXR1cm4gUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6YXJlRG9tYWluc0Fzc29j aWF0ZWQoc2hvdWxkRW5hYmxlU2l0ZVNwZWNpZmljUXVpcmtzKHBhZ2UpLCBmaXJzdERvbWFpbiwg c2Vjb25kRG9tYWluKTsKLX0KLQogdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0Tm90aWZp Y2F0aW9uQ2FsbGJhY2soV1RGOjpGdW5jdGlvbjx2b2lkIChWZWN0b3I8UmVzb3VyY2VMb2FkU3Rh dGlzdGljcz4mJik+JiYgbm90aWZpY2F0aW9uQ2FsbGJhY2spCiB7CiAgICAgQVNTRVJUKCFtX25v dGlmaWNhdGlvbkNhbGxiYWNrKTsKQEAgLTEyNyw5ICsxMDksNiBAQCB2b2lkIFJlc291cmNlTG9h ZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJjZUxvYWRpbmcoY29uc3QgRnJhbWUqIGZyYW1lLCBjb25z dCBSZXNvdQogICAgIGF1dG8gbWFpbkZyYW1lUHJpbWFyeURvbWFpbiA9IHByaW1hcnlEb21haW4o bWFpbkZyYW1lVVJMKTsKICAgICBhdXRvIHNvdXJjZVByaW1hcnlEb21haW4gPSBwcmltYXJ5RG9t YWluKHNvdXJjZVVSTCk7CiAgICAgCi0gICAgaWYgKGFyZURvbWFpbnNBc3NvY2lhdGVkKHBhZ2Us IHRhcmdldFByaW1hcnlEb21haW4sIG1haW5GcmFtZVByaW1hcnlEb21haW4pIHx8IChpc1JlZGly ZWN0ICYmIGFyZURvbWFpbnNBc3NvY2lhdGVkKHBhZ2UsIHRhcmdldFByaW1hcnlEb21haW4sIHNv dXJjZVByaW1hcnlEb21haW4pKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgYm9vbCBzaG91bGRD YWxsTm90aWZpY2F0aW9uQ2FsbGJhY2sgPSBmYWxzZTsKICAgICB7CiAgICAgICAgIGF1dG8mIHRh cmdldFN0YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWlu KHRhcmdldFByaW1hcnlEb21haW4pOwpAQCAtMTc0LDkgKzE1Myw2IEBAIHZvaWQgUmVzb3VyY2VM b2FkT2JzZXJ2ZXI6OmxvZ1dlYlNvY2tldExvYWRpbmcoY29uc3QgRnJhbWUqIGZyYW1lLCBjb25z dCBVUkwmIHRhCiAgICAgYXV0byB0YXJnZXRQcmltYXJ5RG9tYWluID0gcHJpbWFyeURvbWFpbih0 YXJnZXRVUkwpOwogICAgIGF1dG8gbWFpbkZyYW1lUHJpbWFyeURvbWFpbiA9IHByaW1hcnlEb21h aW4obWFpbkZyYW1lVVJMKTsKICAgICAKLSAgICBpZiAoYXJlRG9tYWluc0Fzc29jaWF0ZWQocGFn ZSwgdGFyZ2V0UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1lUHJpbWFyeURvbWFpbikpCi0gICAgICAg IHJldHVybjsKLQogICAgIGF1dG8mIHRhcmdldFN0YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0 YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdldFByaW1hcnlEb21haW4pOwogICAgIHRhcmdl dFN0YXRpc3RpY3MubGFzdFNlZW4gPSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjpyZWR1Y2VUaW1l UmVzb2x1dGlvbihXYWxsVGltZTo6bm93KCkpOwogICAgIGlmICh0YXJnZXRTdGF0aXN0aWNzLnN1 YnJlc291cmNlVW5kZXJUb3BGcmFtZU9yaWdpbnMuYWRkKG1haW5GcmFtZVByaW1hcnlEb21haW4p LmlzTmV3RW50cnkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VM b2FkU3RhdGlzdGljcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3Rh dGlzdGljcy5jcHAKaW5kZXggZDc1NjM5YzYyYzAzODVlNjU1YzZiOTFkOWU5Y2RmMDc0ODQ0M2Fm NC4uOWUyYjdjZjMxNTE5Y2ViMzg1NmMzODYxNmM3NTcyMDcyNGY3MGVkZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmNwcApAQCAtMSw1ICsx LDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTYtMjAxNyBBcHBsZSBJbmMuICBBbGwgcmln aHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE2LTIwMTggQXBwbGUgSW5jLiAgQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzUz LDQwICszNTMsNiBAQCBTdHJpbmcgUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6cHJpbWFyeURvbWFp bihTdHJpbmdWaWV3IGhvc3QpCiAgICAgcmV0dXJuIGhvc3RTdHJpbmc7CiB9CiAKLS8vIEZJWE1F OiBUZW1wb3JhcnkgZml4IGZvciA8cmRhcjovL3Byb2JsZW0vMzIzNDMyNTY+IHVudGlsIGNvbnRl bnQgY2FuIGJlIHVwZGF0ZWQuCi1ib29sIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmFyZURvbWFp bnNBc3NvY2lhdGVkKGJvb2wgbmVlZHNTaXRlU3BlY2lmaWNRdWlya3MsIGNvbnN0IFN0cmluZyYg Zmlyc3REb21haW4sIGNvbnN0IFN0cmluZyYgc2Vjb25kRG9tYWluKQotewotICAgIEFTU0VSVChp c01haW5UaHJlYWQoKSk7Ci0KLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8SGFzaE1hcDxTdHJp bmcsIHVuc2lnbmVkPj4gbWV0YURvbWFpbklkZW50aWZpZXJzID0gW10gewotICAgICAgICBIYXNo TWFwPFN0cmluZywgdW5zaWduZWQ+IG1hcDsKLQotICAgICAgICAvLyBEb21haW5zIG93bmVkIGJ5 IERvdyBKb25lcyAmIENvbXBhbnksIEluYy4KLSAgICAgICAgY29uc3QgdW5zaWduZWQgZG93Sm9u ZXNJZGVudGlmaWVyID0gMTsKLSAgICAgICAgbWFwLmFkZCgiZG93am9uZXMuY29tIl9zLCBkb3dK b25lc0lkZW50aWZpZXIpOwotICAgICAgICBtYXAuYWRkKCJ3c2ouY29tIl9zLCBkb3dKb25lc0lk ZW50aWZpZXIpOwotICAgICAgICBtYXAuYWRkKCJiYXJyb25zLmNvbSJfcywgZG93Sm9uZXNJZGVu dGlmaWVyKTsKLSAgICAgICAgbWFwLmFkZCgibWFya2V0d2F0Y2guY29tIl9zLCBkb3dKb25lc0lk ZW50aWZpZXIpOwotICAgICAgICBtYXAuYWRkKCJ3c2pwbHVzLmNvbSJfcywgZG93Sm9uZXNJZGVu dGlmaWVyKTsKLQotICAgICAgICByZXR1cm4gbWFwOwotICAgIH0oKTsKLQotICAgIGlmIChmaXJz dERvbWFpbiA9PSBzZWNvbmREb21haW4pCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgQVNT RVJUKCFlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGZpcnN0RG9tYWluLCBzZWNvbmREb21haW4pKTsK LQotICAgIGlmICghbmVlZHNTaXRlU3BlY2lmaWNRdWlya3MpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLQotICAgIHVuc2lnbmVkIGZpcnN0TWV0YURvbWFpbklkZW50aWZpZXIgPSBtZXRhRG9tYWlu SWRlbnRpZmllcnMuZ2V0KCkuZ2V0KGZpcnN0RG9tYWluKTsKLSAgICBpZiAoIWZpcnN0TWV0YURv bWFpbklkZW50aWZpZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiBmaXJz dE1ldGFEb21haW5JZGVudGlmaWVyID09IG1ldGFEb21haW5JZGVudGlmaWVycy5nZXQoKS5nZXQo c2Vjb25kRG9tYWluKTsKLX0KLQogV2FsbFRpbWUgUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6cmVk dWNlVGltZVJlc29sdXRpb24oV2FsbFRpbWUgdGltZSkKIHsKICAgICByZXR1cm4gV2FsbFRpbWU6 OmZyb21SYXdTZWNvbmRzKHN0ZDo6Zmxvb3IodGltZS5zZWNvbmRzU2luY2VFcG9jaCgpIC8gdGlt ZXN0YW1wUmVzb2x1dGlvbikgKiB0aW1lc3RhbXBSZXNvbHV0aW9uLnNlY29uZHMoKSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuaAppbmRleCBlYjlj N2I2OTA2NDkzZGQ5ZTc4YjQ1ZDhjMWI4N2U3NDMxZDliMDMzLi44YzllZDRjMmJhMWZiMzRhNTli NjMyMmQ5YmVlYmFmZjgzYjYyZDQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNv dXJjZUxvYWRTdGF0aXN0aWNzLmgKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChD KSAyMDE2LTIwMTcgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdo dCAoQykgMjAxNi0yMDE4IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTUzLDcgKzUzLDYgQEAgc3RydWN0IFJlc291cmNl TG9hZFN0YXRpc3RpY3MgewogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBTdHJpbmcgcHJpbWFy eURvbWFpbihjb25zdCBVUkwmKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgU3RyaW5nIHBy aW1hcnlEb21haW4oU3RyaW5nVmlldyBob3N0KTsKIAotICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRp YyBib29sIGFyZURvbWFpbnNBc3NvY2lhdGVkKGJvb2wgbmVlZHNTaXRlU3BlY2lmaWNRdWlya3Ms IGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRp YyBXYWxsVGltZSByZWR1Y2VUaW1lUmVzb2x1dGlvbihXYWxsVGltZSk7CiAKICAgICBXRUJDT1JF X0VYUE9SVCB2b2lkIGVuY29kZShLZXllZEVuY29kZXImKSBjb25zdDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5 U3RvcmUuY3BwCmluZGV4IDM0OGNhY2QzYmU1MTE1Y2Q3OTdjZWQ4ODU2ZWU1NDZhMzFmYWYwMDcu LjE3YjBiYzdlNDFjNjBkZjZiMWRlNzMwMTdmNDBiMmU1ODU3ZmJmNWYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01l bW9yeVN0b3JlLmNwcApAQCAtNjAyLDE5ICs2MDIsMTkgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzTWVtb3J5U3RvcmU6OmNhbmNlbFBlbmRpbmdTdGF0aXN0aWNzUHJvY2Vzc2luZ1JlcXVl c3QKICAgICBtX3BlbmRpbmdTdGF0aXN0aWNzUHJvY2Vzc2luZ1JlcXVlc3RJZGVudGlmaWVyID0g c3RkOjpudWxsb3B0OwogfQogCi12b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9y ZTo6bG9nRnJhbWVOYXZpZ2F0aW9uKGNvbnN0IFN0cmluZyYgdGFyZ2V0UHJpbWFyeURvbWFpbiwg Y29uc3QgU3RyaW5nJiBtYWluRnJhbWVQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJpbmcmIHNvdXJj ZVByaW1hcnlEb21haW4sIGNvbnN0IFN0cmluZyYgdGFyZ2V0SG9zdCwgY29uc3QgU3RyaW5nJiBt YWluRnJhbWVIb3N0LCBib29sIGFyZVRhcmdldEFuZE1haW5GcmFtZURvbWFpbnNBc3NvY2lhdGVk LCBib29sIGFyZVRhcmdldEFuZFNvdXJjZURvbWFpbnNBc3NvY2lhdGVkLCBib29sIGlzUmVkaXJl Y3QsIGJvb2wgaXNNYWluRnJhbWUpCit2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlT dG9yZTo6bG9nRnJhbWVOYXZpZ2F0aW9uKGNvbnN0IFN0cmluZyYgdGFyZ2V0UHJpbWFyeURvbWFp biwgY29uc3QgU3RyaW5nJiBtYWluRnJhbWVQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJpbmcmIHNv dXJjZVByaW1hcnlEb21haW4sIGNvbnN0IFN0cmluZyYgdGFyZ2V0SG9zdCwgY29uc3QgU3RyaW5n JiBtYWluRnJhbWVIb3N0LCBib29sIGlzUmVkaXJlY3QsIGJvb2wgaXNNYWluRnJhbWUpCiB7CiAg ICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CiAKICAgICBib29sIHN0YXRpc3RpY3NXZXJl VXBkYXRlZCA9IGZhbHNlOwotICAgIGlmICh0YXJnZXRIb3N0ICE9IG1haW5GcmFtZUhvc3QgJiYg IShhcmVUYXJnZXRBbmRNYWluRnJhbWVEb21haW5zQXNzb2NpYXRlZCB8fCBhcmVUYXJnZXRBbmRT b3VyY2VEb21haW5zQXNzb2NpYXRlZCkpIHsKKyAgICBpZiAodGFyZ2V0SG9zdCAhPSBtYWluRnJh bWVIb3N0KSB7CiAgICAgICAgIGF1dG8mIHRhcmdldFN0YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJj ZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdldFByaW1hcnlEb21haW4pOwogICAgICAg ICB0YXJnZXRTdGF0aXN0aWNzLmxhc3RTZWVuID0gUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6cmVk dWNlVGltZVJlc29sdXRpb24oV2FsbFRpbWU6Om5vdygpKTsKICAgICAgICAgaWYgKHRhcmdldFN0 YXRpc3RpY3Muc3ViZnJhbWVVbmRlclRvcEZyYW1lT3JpZ2lucy5hZGQobWFpbkZyYW1lUHJpbWFy eURvbWFpbikuaXNOZXdFbnRyeSkKICAgICAgICAgICAgIHN0YXRpc3RpY3NXZXJlVXBkYXRlZCA9 IHRydWU7CiAgICAgfQogCi0gICAgaWYgKGlzUmVkaXJlY3QgJiYgIWFyZVRhcmdldEFuZFNvdXJj ZURvbWFpbnNBc3NvY2lhdGVkKSB7CisgICAgaWYgKGlzUmVkaXJlY3QpIHsKICAgICAgICAgaWYg KGlzTWFpbkZyYW1lKSB7CiAgICAgICAgICAgICBhdXRvJiByZWRpcmVjdGluZ09yaWdpblN0YXRp c3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHNvdXJjZVBy aW1hcnlEb21haW4pOwogICAgICAgICAgICAgaWYgKHJlZGlyZWN0aW5nT3JpZ2luU3RhdGlzdGlj cy50b3BGcmFtZVVuaXF1ZVJlZGlyZWN0c1RvLmFkZCh0YXJnZXRQcmltYXJ5RG9tYWluKS5pc05l d0VudHJ5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVzb3VyY2VMb2Fk U3RhdGlzdGljc01lbW9yeVN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZXNvdXJj ZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuaAppbmRleCAyNTc4N2Y5YzA1YWY1NGNlMjUzMjg3 YWY1ZTA3Mzc3ZWJhMDQzYTkyLi40ZTJlYzI0MjVhZWU4YTBlMzIzZDRjZjdlODM3NjVkNWJmY2Zi YzJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzTWVtb3J5U3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZXNvdXJj ZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuaApAQCAtMTE5LDcgKzExOSw3IEBAIHB1YmxpYzoK ICAgICB2b2lkIHJlcXVlc3RTdG9yYWdlQWNjZXNzKFN0cmluZyYmIHN1YkZyYW1lUHJpbWFyeURv bWFpbiwgU3RyaW5nJiYgdG9wRnJhbWVQcmltYXJ5RG9tYWluLCB1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBwYWdlSUQsIGJvb2wgcHJvbXB0RW5hYmxlZCwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChTdG9yYWdlQWNjZXNzU3RhdHVzKT4mJik7CiAgICAgdm9pZCBncmFudFN0b3JhZ2VBY2Nlc3Mo U3RyaW5nJiYgc3ViRnJhbWVIb3N0LCBTdHJpbmcmJiB0b3BGcmFtZUhvc3QsIHVpbnQ2NF90IGZy YW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgYm9vbCB1c2VyV2FzUHJvbXB0ZWROb3csIENvbXBsZXRp b25IYW5kbGVyPHZvaWQoYm9vbCk+JiYpOwogCi0gICAgdm9pZCBsb2dGcmFtZU5hdmlnYXRpb24o Y29uc3QgU3RyaW5nJiB0YXJnZXRQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJpbmcmIG1haW5GcmFt ZVByaW1hcnlEb21haW4sIGNvbnN0IFN0cmluZyYgc291cmNlUHJpbWFyeURvbWFpbiwgY29uc3Qg U3RyaW5nJiB0YXJnZXRIb3N0LCBjb25zdCBTdHJpbmcmIG1haW5GcmFtZUhvc3QsIGJvb2wgYXJl VGFyZ2V0QW5kTWFpbkZyYW1lRG9tYWluc0Fzc29jaWF0ZWQsIGJvb2wgYXJlVGFyZ2V0QW5kU291 cmNlRG9tYWluc0Fzc29jaWF0ZWQsIGJvb2wgaXNSZWRpcmVjdCwgYm9vbCBpc01haW5GcmFtZSk7 CisgICAgdm9pZCBsb2dGcmFtZU5hdmlnYXRpb24oY29uc3QgU3RyaW5nJiB0YXJnZXRQcmltYXJ5 RG9tYWluLCBjb25zdCBTdHJpbmcmIG1haW5GcmFtZVByaW1hcnlEb21haW4sIGNvbnN0IFN0cmlu ZyYgc291cmNlUHJpbWFyeURvbWFpbiwgY29uc3QgU3RyaW5nJiB0YXJnZXRIb3N0LCBjb25zdCBT dHJpbmcmIG1haW5GcmFtZUhvc3QsIGJvb2wgaXNSZWRpcmVjdCwgYm9vbCBpc01haW5GcmFtZSk7 CiAgICAgdm9pZCBsb2dVc2VySW50ZXJhY3Rpb24oY29uc3QgU3RyaW5nJiBwcmltYXJ5RG9tYWlu KTsKIAogICAgIHZvaWQgY2xlYXJVc2VySW50ZXJhY3Rpb24oY29uc3QgU3RyaW5nJiBwcmltYXJ5 RG9tYWluKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCmluZGV4IDI4NzdjYWQxMTQzMDhjYjJjZWMxZDg2 MDVlYzkxNjgwNDQ4NDc5MzMuLmYyOWY3ZmQ0NjU1NmMzZTU3YTFjZDE1ZjViNjZmNTRlMGFhMzU5 MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcApAQCAtNTAsMTIgKzUwLDYgQEAgdGVtcGxhdGU8dHlw ZW5hbWUgVD4gc3RhdGljIGlubGluZSBTdHJpbmcgaXNvbGF0ZWRQcmltYXJ5RG9tYWluKGNvbnN0 IFQmIHZhbHVlKQogICAgIHJldHVybiBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjpwcmltYXJ5RG9t YWluKHZhbHVlKS5pc29sYXRlZENvcHkoKTsKIH0KIAotc3RhdGljIGJvb2wgYXJlRG9tYWluc0Fz c29jaWF0ZWQoV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBTdHJpbmcmIGZpcnN0RG9tYWluLCBj b25zdCBTdHJpbmcmIHNlY29uZERvbWFpbikKLXsKLSAgICBib29sIG5lZWRzU2l0ZVNwZWNpZmlj UXVpcmtzID0gcGFnZSAmJiBwYWdlLT5wcmVmZXJlbmNlcygpLm5lZWRzU2l0ZVNwZWNpZmljUXVp cmtzKCk7Ci0gICAgcmV0dXJuIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmFyZURvbWFpbnNBc3Nv Y2lhdGVkKG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzLCBmaXJzdERvbWFpbiwgc2Vjb25kRG9tYWlu KTsKLX0KLQogY29uc3QgT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4mIFdlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6bW9uaXRvcmVkRGF0YVR5cGVzKCkKIHsKICAgICBzdGF0aWMgTmV2 ZXJEZXN0cm95ZWQ8T3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4+IGRhdGFUeXBlcyhzdGQ6Omlu aXRpYWxpemVyX2xpc3Q8V2Vic2l0ZURhdGFUeXBlPih7CkBAIC0zOTIsMTcgKzM4NiwxMyBAQCB2 b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bG9nRnJhbWVOYXZpZ2F0aW9uKGNv bnN0IFdlYkZyYW1lUHJveHkmIGZyYQogICAgIGlmICh0YXJnZXRIb3N0LmlzRW1wdHkoKSB8fCBt YWluRnJhbWVIb3N0LmlzRW1wdHkoKSB8fCB0YXJnZXRIb3N0ID09IHNvdXJjZVVSTC5ob3N0KCkp CiAgICAgICAgIHJldHVybjsKIAotICAgIGF1dG8qIHBhZ2UgPSBmcmFtZS5wYWdlKCk7CiAgICAg YXV0byB0YXJnZXRQcmltYXJ5RG9tYWluID0gUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6cHJpbWFy eURvbWFpbih0YXJnZXRVUkwpOwogICAgIGF1dG8gbWFpbkZyYW1lUHJpbWFyeURvbWFpbiA9IFJl c291cmNlTG9hZFN0YXRpc3RpY3M6OnByaW1hcnlEb21haW4ocGFnZVVSTCk7CiAgICAgYXV0byBz b3VyY2VQcmltYXJ5RG9tYWluID0gUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6cHJpbWFyeURvbWFp bihzb3VyY2VVUkwpOwogCi0gICAgYm9vbCBhcmVUYXJnZXRBbmRNYWluRnJhbWVEb21haW5zQXNz b2NpYXRlZCA9IGFyZURvbWFpbnNBc3NvY2lhdGVkKHBhZ2UsIHRhcmdldFByaW1hcnlEb21haW4s IG1haW5GcmFtZVByaW1hcnlEb21haW4pOwotICAgIGJvb2wgYXJlVGFyZ2V0QW5kU291cmNlRG9t YWluc0Fzc29jaWF0ZWQgPSBhcmVEb21haW5zQXNzb2NpYXRlZChwYWdlLCB0YXJnZXRQcmltYXJ5 RG9tYWluLCBzb3VyY2VQcmltYXJ5RG9tYWluKTsKLQotICAgIHBvc3RUYXNrKFt0aGlzLCB0YXJn ZXRQcmltYXJ5RG9tYWluID0gdGFyZ2V0UHJpbWFyeURvbWFpbi5pc29sYXRlZENvcHkoKSwgbWFp bkZyYW1lUHJpbWFyeURvbWFpbiA9IG1haW5GcmFtZVByaW1hcnlEb21haW4uaXNvbGF0ZWRDb3B5 KCksIHNvdXJjZVByaW1hcnlEb21haW4gPSBzb3VyY2VQcmltYXJ5RG9tYWluLmlzb2xhdGVkQ29w eSgpLCB0YXJnZXRIb3N0ID0gdGFyZ2V0SG9zdC50b1N0cmluZygpLmlzb2xhdGVkQ29weSgpLCBt YWluRnJhbWVIb3N0ID0gbWFpbkZyYW1lSG9zdC50b1N0cmluZygpLmlzb2xhdGVkQ29weSgpLCBh cmVUYXJnZXRBbmRNYWluRnJhbWVEb21haW5zQXNzb2NpYXRlZCwgYXJlVGFyZ2V0QW5kU291cmNl RG9tYWluc0Fzc29jaWF0ZWQsIGlzUmVkaXJlY3QsIGlzTWFpbkZyYW1lID0gZnJhbWUuaXNNYWlu RnJhbWUoKV0geworICAgIHBvc3RUYXNrKFt0aGlzLCB0YXJnZXRQcmltYXJ5RG9tYWluID0gdGFy Z2V0UHJpbWFyeURvbWFpbi5pc29sYXRlZENvcHkoKSwgbWFpbkZyYW1lUHJpbWFyeURvbWFpbiA9 IG1haW5GcmFtZVByaW1hcnlEb21haW4uaXNvbGF0ZWRDb3B5KCksIHNvdXJjZVByaW1hcnlEb21h aW4gPSBzb3VyY2VQcmltYXJ5RG9tYWluLmlzb2xhdGVkQ29weSgpLCB0YXJnZXRIb3N0ID0gdGFy Z2V0SG9zdC50b1N0cmluZygpLmlzb2xhdGVkQ29weSgpLCBtYWluRnJhbWVIb3N0ID0gbWFpbkZy YW1lSG9zdC50b1N0cmluZygpLmlzb2xhdGVkQ29weSgpLCBpc1JlZGlyZWN0LCBpc01haW5GcmFt ZSA9IGZyYW1lLmlzTWFpbkZyYW1lKCldIHsKICAgICAgICAgaWYgKG1fbWVtb3J5U3RvcmUpCi0g ICAgICAgICAgICBtX21lbW9yeVN0b3JlLT5sb2dGcmFtZU5hdmlnYXRpb24odGFyZ2V0UHJpbWFy eURvbWFpbiwgbWFpbkZyYW1lUHJpbWFyeURvbWFpbiwgc291cmNlUHJpbWFyeURvbWFpbiwgdGFy Z2V0SG9zdCwgbWFpbkZyYW1lSG9zdCwgYXJlVGFyZ2V0QW5kTWFpbkZyYW1lRG9tYWluc0Fzc29j aWF0ZWQsIGFyZVRhcmdldEFuZFNvdXJjZURvbWFpbnNBc3NvY2lhdGVkLCBpc1JlZGlyZWN0LCBp c01haW5GcmFtZSk7CisgICAgICAgICAgICBtX21lbW9yeVN0b3JlLT5sb2dGcmFtZU5hdmlnYXRp b24odGFyZ2V0UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1lUHJpbWFyeURvbWFpbiwgc291cmNlUHJp bWFyeURvbWFpbiwgdGFyZ2V0SG9zdCwgbWFpbkZyYW1lSG9zdCwgaXNSZWRpcmVjdCwgaXNNYWlu RnJhbWUpOwogICAgIH0pOwogfQogCg== 347659 2018-08-21 10:45:24 -0700 2018-08-21 11:40:53 -0700 Patch bug-188756-20180821104524.patch text/plain 14249 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQxNDExYjA3ZDY2ZTcy OWNmNWIwMWM0MzkwMGI3NmJlNzkyMDgxMi4uOGM2YTdiZGI0YzdkNGYxZDYyZWVmNTExMDVlYTcz YzMyNzViOTA0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA4LTIxICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBleHBlcmlt ZW50YWwgYWZmaWxpYXRlZCBkb21haW4gY29kZSBub3cgdGhhdCBTdG9yYWdlQWNjZXNzIEFQSSBp cyBhdmFpbGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4ODc1NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDM1Mjc4NDg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gQnVnIDE3NDY2MSB3ZSBh ZGRlZCBhIGNvbXBhdGliaWxpdHkgcXVpcmsgdG8gc3VwcG9ydCB3c2ouY29tIGF1dGhlbnRpY2F0 aW9uLiBUaGlzIHF1aXJrIGlzIG5vIGxvbmdlciBuZWVkZWQsCisgICAgICAgIHNpbmNlIHRoZSBT dG9yYWdlQWNjZXNzIEFQSSBwcm92aWRlcyB0aGUgbmVjZXNzYXJ5IHRvb2xzIHRvIGRvIHRoaXMg dHlwZSBvZiBpbnRlcmFjdGlvbiB3aXRob3V0IG5lZWRpbmcgZ2xvYmFsCisgICAgICAgIGNyb3Nz LXNpdGUgYWNjZXNzLgorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJj ZUxvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1dl YlNvY2tldExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6YXJlRG9tYWluc0Fzc29jaWF0ZWQp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkRW5hYmxlU2l0ZVNwZWNpZmljUXVp cmtzKTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjphcmVEb21haW5z QXNzb2NpYXRlZCk6IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3MuaDoKKwogMjAxOC0wOC0yMSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KIAogICAgICAgICBEb24ndCBwbGFjZSAidXNpbmcgbmFtZXNwYWNlIFhYWDsiIGlu IGdsb2JhbCBzcGFjZSBmb3IgdW5pZmllZCBzb3VyY2UgYnVpbGRzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ3ZDIz ZGFiYjhhMzRhYTkzMmE1ZGQ2MzE5YmNmZmJiYTFhNzgzOGQuLjI4MGNhYjIyNTA4N2E5ZGRhNzg2 NWE3NjI0ZmY0MTIzNDc4NzdjYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTgtMDgt MjEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3Zl IGV4cGVyaW1lbnRhbCBhZmZpbGlhdGVkIGRvbWFpbiBjb2RlIG5vdyB0aGF0IFN0b3JhZ2VBY2Nl c3MgQVBJIGlzIGF2YWlsYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTg4NzU2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MzUyNzg0OD4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBCdWcgMTc0 NjYxIHdlIGFkZGVkIGEgY29tcGF0aWJpbGl0eSBxdWlyayB0byBzdXBwb3J0IHdzai5jb20gYXV0 aGVudGljYXRpb24uIFRoaXMgcXVpcmsgaXMgbm8gbG9uZ2VyIG5lZWRlZCwKKyAgICAgICAgc2lu Y2UgdGhlIFN0b3JhZ2VBY2Nlc3MgQVBJIHByb3ZpZGVzIHRoZSBuZWNlc3NhcnkgdG9vbHMgdG8g ZG8gdGhpcyB0eXBlIG9mIGludGVyYWN0aW9uIHdpdGhvdXQgbmVlZGluZyBnbG9iYWwKKyAgICAg ICAgY3Jvc3Mtc2l0ZSBhY2Nlc3MuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVzb3VyY2VMb2Fk U3RhdGlzdGljc01lbW9yeVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2Fk U3RhdGlzdGljc01lbW9yeVN0b3JlOjpsb2dGcmFtZU5hdmlnYXRpb24pOgorICAgICAgICAqIFVJ UHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpsb2dGcmFtZU5hdmlnYXRpb24p OgorICAgICAgICAoV2ViS2l0OjphcmVEb21haW5zQXNzb2NpYXRlZCk6IERlbGV0ZWQuCisKIDIw MTgtMDgtMjEgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMzQ5ODEuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcAppbmRleCA1MTFiOTEyYTI1NDBjMzkyNjMw NGFiZWRjYjhlYzA0NTQwMjE3MDkyLi41NjE1YTNlN2I1ZmRmZDMyZDNmMGNiY2QzYmU3YWQwMmVl MjMzNzEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2Jz ZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZl ci5jcHAKQEAgLTU1LDI0ICs1NSw2IEBAIFJlc291cmNlTG9hZE9ic2VydmVyJiBSZXNvdXJjZUxv YWRPYnNlcnZlcjo6c2hhcmVkKCkKICAgICByZXR1cm4gcmVzb3VyY2VMb2FkT2JzZXJ2ZXI7CiB9 CiAKLXN0YXRpYyBib29sIHNob3VsZEVuYWJsZVNpdGVTcGVjaWZpY1F1aXJrcyhQYWdlKiBwYWdl KQotewotI2lmIFBMQVRGT1JNKElPUykKLSAgICBVTlVTRURfUEFSQU0ocGFnZSk7Ci0KLSAgICAv LyBUaGVyZSBpcyBjdXJyZW50bHkgbm8gd2F5IHRvIHRvZ2dsZSB0aGUgbmVlZHNTaXRlU3BlY2lm aWNRdWlya3Mgc2V0dGluZyBvbiBpT1Mgc28gd2UgYWx3YXlzIGVuYWJsZQotICAgIC8vIHRoZSBz aXRlLXNwZWNpZmljIHF1aXJrcyBvbiBpT1MuCi0gICAgcmV0dXJuIHRydWU7Ci0jZWxzZQotICAg IHJldHVybiBwYWdlICYmIHBhZ2UtPnNldHRpbmdzKCkubmVlZHNTaXRlU3BlY2lmaWNRdWlya3Mo KTsKLSNlbmRpZgotfQotCi1zdGF0aWMgYm9vbCBhcmVEb21haW5zQXNzb2NpYXRlZChQYWdlKiBw YWdlLCBjb25zdCBTdHJpbmcmIGZpcnN0RG9tYWluLCBjb25zdCBTdHJpbmcmIHNlY29uZERvbWFp bikKLXsKLSAgICByZXR1cm4gUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6YXJlRG9tYWluc0Fzc29j aWF0ZWQoc2hvdWxkRW5hYmxlU2l0ZVNwZWNpZmljUXVpcmtzKHBhZ2UpLCBmaXJzdERvbWFpbiwg c2Vjb25kRG9tYWluKTsKLX0KLQogdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0Tm90aWZp Y2F0aW9uQ2FsbGJhY2soV1RGOjpGdW5jdGlvbjx2b2lkIChWZWN0b3I8UmVzb3VyY2VMb2FkU3Rh dGlzdGljcz4mJik+JiYgbm90aWZpY2F0aW9uQ2FsbGJhY2spCiB7CiAgICAgQVNTRVJUKCFtX25v dGlmaWNhdGlvbkNhbGxiYWNrKTsKQEAgLTEyNiw4ICsxMDgsOCBAQCB2b2lkIFJlc291cmNlTG9h ZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJjZUxvYWRpbmcoY29uc3QgRnJhbWUqIGZyYW1lLCBjb25z dCBSZXNvdQogICAgIGF1dG8gdGFyZ2V0UHJpbWFyeURvbWFpbiA9IHByaW1hcnlEb21haW4odGFy Z2V0VVJMKTsKICAgICBhdXRvIG1haW5GcmFtZVByaW1hcnlEb21haW4gPSBwcmltYXJ5RG9tYWlu KG1haW5GcmFtZVVSTCk7CiAgICAgYXV0byBzb3VyY2VQcmltYXJ5RG9tYWluID0gcHJpbWFyeURv bWFpbihzb3VyY2VVUkwpOwotICAgIAotICAgIGlmIChhcmVEb21haW5zQXNzb2NpYXRlZChwYWdl LCB0YXJnZXRQcmltYXJ5RG9tYWluLCBtYWluRnJhbWVQcmltYXJ5RG9tYWluKSB8fCAoaXNSZWRp cmVjdCAmJiBhcmVEb21haW5zQXNzb2NpYXRlZChwYWdlLCB0YXJnZXRQcmltYXJ5RG9tYWluLCBz b3VyY2VQcmltYXJ5RG9tYWluKSkpCisKKyAgICBpZiAodGFyZ2V0UHJpbWFyeURvbWFpbiA9PSBt YWluRnJhbWVQcmltYXJ5RG9tYWluIHx8IChpc1JlZGlyZWN0ICYmIHRhcmdldFByaW1hcnlEb21h aW4gPT0gc291cmNlUHJpbWFyeURvbWFpbikpCiAgICAgICAgIHJldHVybjsKIAogICAgIGJvb2wg c2hvdWxkQ2FsbE5vdGlmaWNhdGlvbkNhbGxiYWNrID0gZmFsc2U7CkBAIC0xNzMsOCArMTU1LDgg QEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nV2ViU29ja2V0TG9hZGluZyhjb25zdCBG cmFtZSogZnJhbWUsIGNvbnN0IFVSTCYgdGEKICAgICAKICAgICBhdXRvIHRhcmdldFByaW1hcnlE b21haW4gPSBwcmltYXJ5RG9tYWluKHRhcmdldFVSTCk7CiAgICAgYXV0byBtYWluRnJhbWVQcmlt YXJ5RG9tYWluID0gcHJpbWFyeURvbWFpbihtYWluRnJhbWVVUkwpOwotICAgIAotICAgIGlmIChh cmVEb21haW5zQXNzb2NpYXRlZChwYWdlLCB0YXJnZXRQcmltYXJ5RG9tYWluLCBtYWluRnJhbWVQ cmltYXJ5RG9tYWluKSkKKworICAgIGlmICh0YXJnZXRQcmltYXJ5RG9tYWluID09IG1haW5GcmFt ZVByaW1hcnlEb21haW4pCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8mIHRhcmdldFN0YXRp c3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdldFBy aW1hcnlEb21haW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNl TG9hZFN0YXRpc3RpY3MuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0 YXRpc3RpY3MuY3BwCmluZGV4IGQ3NTYzOWM2MmMwMzg1ZTY1NWM2YjkxZDllOWNkZjA3NDg0NDNh ZjQuLjllMmI3Y2YzMTUxOWNlYjM4NTZjMzg2MTZjNzU3MjA3MjRmNzBlZGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5jcHAKQEAgLTEsNSAr MSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE2LTIwMTcgQXBwbGUgSW5jLiAgQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNi0yMDE4IEFwcGxlIEluYy4gIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM1 Myw0MCArMzUzLDYgQEAgU3RyaW5nIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OnByaW1hcnlEb21h aW4oU3RyaW5nVmlldyBob3N0KQogICAgIHJldHVybiBob3N0U3RyaW5nOwogfQogCi0vLyBGSVhN RTogVGVtcG9yYXJ5IGZpeCBmb3IgPHJkYXI6Ly9wcm9ibGVtLzMyMzQzMjU2PiB1bnRpbCBjb250 ZW50IGNhbiBiZSB1cGRhdGVkLgotYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjphcmVEb21h aW5zQXNzb2NpYXRlZChib29sIG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzLCBjb25zdCBTdHJpbmcm IGZpcnN0RG9tYWluLCBjb25zdCBTdHJpbmcmIHNlY29uZERvbWFpbikKLXsKLSAgICBBU1NFUlQo aXNNYWluVGhyZWFkKCkpOwotCi0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hNYXA8U3Ry aW5nLCB1bnNpZ25lZD4+IG1ldGFEb21haW5JZGVudGlmaWVycyA9IFtdIHsKLSAgICAgICAgSGFz aE1hcDxTdHJpbmcsIHVuc2lnbmVkPiBtYXA7Ci0KLSAgICAgICAgLy8gRG9tYWlucyBvd25lZCBi eSBEb3cgSm9uZXMgJiBDb21wYW55LCBJbmMuCi0gICAgICAgIGNvbnN0IHVuc2lnbmVkIGRvd0pv bmVzSWRlbnRpZmllciA9IDE7Ci0gICAgICAgIG1hcC5hZGQoImRvd2pvbmVzLmNvbSJfcywgZG93 Sm9uZXNJZGVudGlmaWVyKTsKLSAgICAgICAgbWFwLmFkZCgid3NqLmNvbSJfcywgZG93Sm9uZXNJ ZGVudGlmaWVyKTsKLSAgICAgICAgbWFwLmFkZCgiYmFycm9ucy5jb20iX3MsIGRvd0pvbmVzSWRl bnRpZmllcik7Ci0gICAgICAgIG1hcC5hZGQoIm1hcmtldHdhdGNoLmNvbSJfcywgZG93Sm9uZXNJ ZGVudGlmaWVyKTsKLSAgICAgICAgbWFwLmFkZCgid3NqcGx1cy5jb20iX3MsIGRvd0pvbmVzSWRl bnRpZmllcik7Ci0KLSAgICAgICAgcmV0dXJuIG1hcDsKLSAgICB9KCk7Ci0KLSAgICBpZiAoZmly c3REb21haW4gPT0gc2Vjb25kRG9tYWluKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgIEFT U0VSVCghZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShmaXJzdERvbWFpbiwgc2Vjb25kRG9tYWluKSk7 Ci0KLSAgICBpZiAoIW5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0KLSAgICB1bnNpZ25lZCBmaXJzdE1ldGFEb21haW5JZGVudGlmaWVyID0gbWV0YURvbWFp bklkZW50aWZpZXJzLmdldCgpLmdldChmaXJzdERvbWFpbik7Ci0gICAgaWYgKCFmaXJzdE1ldGFE b21haW5JZGVudGlmaWVyKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICByZXR1cm4gZmly c3RNZXRhRG9tYWluSWRlbnRpZmllciA9PSBtZXRhRG9tYWluSWRlbnRpZmllcnMuZ2V0KCkuZ2V0 KHNlY29uZERvbWFpbik7Ci19Ci0KIFdhbGxUaW1lIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OnJl ZHVjZVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lIHRpbWUpCiB7CiAgICAgcmV0dXJuIFdhbGxUaW1l Ojpmcm9tUmF3U2Vjb25kcyhzdGQ6OmZsb29yKHRpbWUuc2Vjb25kc1NpbmNlRXBvY2goKSAvIHRp bWVzdGFtcFJlc29sdXRpb24pICogdGltZXN0YW1wUmVzb2x1dGlvbi5zZWNvbmRzKCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuaCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmgKaW5kZXggZWI5 YzdiNjkwNjQ5M2RkOWU3OGI0NWQ4YzFiODdlNzQzMWQ5YjAzMy4uOGM5ZWQ0YzJiYTFmYjM0YTU5 YjYzMjJkOWJlZWJhZmY4M2I2MmQ0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVz b3VyY2VMb2FkU3RhdGlzdGljcy5oCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAo QykgMjAxNi0yMDE3IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMTYtMjAxOCBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC01Myw3ICs1Myw2IEBAIHN0cnVjdCBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzIHsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgU3RyaW5nIHByaW1h cnlEb21haW4oY29uc3QgVVJMJik7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFN0cmluZyBw cmltYXJ5RG9tYWluKFN0cmluZ1ZpZXcgaG9zdCk7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCBzdGF0 aWMgYm9vbCBhcmVEb21haW5zQXNzb2NpYXRlZChib29sIG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtz LCBjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0 aWMgV2FsbFRpbWUgcmVkdWNlVGltZVJlc29sdXRpb24oV2FsbFRpbWUpOwogCiAgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCBlbmNvZGUoS2V5ZWRFbmNvZGVyJikgY29uc3Q7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUu Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9y eVN0b3JlLmNwcAppbmRleCAzNDhjYWNkM2JlNTExNWNkNzk3Y2VkODg1NmVlNTQ2YTMxZmFmMDA3 Li5mNGY4YTYwYTYzZTY0MGFhMTUzNmJiNDdlMmM5Y2UwMjBkMTkyZTUxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NN ZW1vcnlTdG9yZS5jcHAKQEAgLTYwMiwxMCArNjAyLDEzIEBAIHZvaWQgUmVzb3VyY2VMb2FkU3Rh dGlzdGljc01lbW9yeVN0b3JlOjpjYW5jZWxQZW5kaW5nU3RhdGlzdGljc1Byb2Nlc3NpbmdSZXF1 ZXN0CiAgICAgbV9wZW5kaW5nU3RhdGlzdGljc1Byb2Nlc3NpbmdSZXF1ZXN0SWRlbnRpZmllciA9 IHN0ZDo6bnVsbG9wdDsKIH0KIAotdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3Rv cmU6OmxvZ0ZyYW1lTmF2aWdhdGlvbihjb25zdCBTdHJpbmcmIHRhcmdldFByaW1hcnlEb21haW4s IGNvbnN0IFN0cmluZyYgbWFpbkZyYW1lUHJpbWFyeURvbWFpbiwgY29uc3QgU3RyaW5nJiBzb3Vy Y2VQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJpbmcmIHRhcmdldEhvc3QsIGNvbnN0IFN0cmluZyYg bWFpbkZyYW1lSG9zdCwgYm9vbCBhcmVUYXJnZXRBbmRNYWluRnJhbWVEb21haW5zQXNzb2NpYXRl ZCwgYm9vbCBhcmVUYXJnZXRBbmRTb3VyY2VEb21haW5zQXNzb2NpYXRlZCwgYm9vbCBpc1JlZGly ZWN0LCBib29sIGlzTWFpbkZyYW1lKQordm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5 U3RvcmU6OmxvZ0ZyYW1lTmF2aWdhdGlvbihjb25zdCBTdHJpbmcmIHRhcmdldFByaW1hcnlEb21h aW4sIGNvbnN0IFN0cmluZyYgbWFpbkZyYW1lUHJpbWFyeURvbWFpbiwgY29uc3QgU3RyaW5nJiBz b3VyY2VQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJpbmcmIHRhcmdldEhvc3QsIGNvbnN0IFN0cmlu ZyYgbWFpbkZyYW1lSG9zdCwgYm9vbCBpc1JlZGlyZWN0LCBib29sIGlzTWFpbkZyYW1lKQogewog ICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwogCisgICAgYm9vbCBhcmVUYXJnZXRBbmRN YWluRnJhbWVEb21haW5zQXNzb2NpYXRlZCA9IHRhcmdldFByaW1hcnlEb21haW4gPT0gbWFpbkZy YW1lUHJpbWFyeURvbWFpbjsKKyAgICBib29sIGFyZVRhcmdldEFuZFNvdXJjZURvbWFpbnNBc3Nv Y2lhdGVkID0gdGFyZ2V0UHJpbWFyeURvbWFpbiA9PSBzb3VyY2VQcmltYXJ5RG9tYWluOworCiAg ICAgYm9vbCBzdGF0aXN0aWNzV2VyZVVwZGF0ZWQgPSBmYWxzZTsKICAgICBpZiAodGFyZ2V0SG9z dCAhPSBtYWluRnJhbWVIb3N0ICYmICEoYXJlVGFyZ2V0QW5kTWFpbkZyYW1lRG9tYWluc0Fzc29j aWF0ZWQgfHwgYXJlVGFyZ2V0QW5kU291cmNlRG9tYWluc0Fzc29jaWF0ZWQpKSB7CiAgICAgICAg IGF1dG8mIHRhcmdldFN0YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmlt YXJ5RG9tYWluKHRhcmdldFByaW1hcnlEb21haW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuaAppbmRl eCAyNTc4N2Y5YzA1YWY1NGNlMjUzMjg3YWY1ZTA3Mzc3ZWJhMDQzYTkyLi40ZTJlYzI0MjVhZWU4 YTBlMzIzZDRjZjdlODM3NjVkNWJmY2ZiYzJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuaApAQCAt MTE5LDcgKzExOSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlcXVlc3RTdG9yYWdlQWNjZXNzKFN0 cmluZyYmIHN1YkZyYW1lUHJpbWFyeURvbWFpbiwgU3RyaW5nJiYgdG9wRnJhbWVQcmltYXJ5RG9t YWluLCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIGJvb2wgcHJvbXB0RW5hYmxl ZCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTdG9yYWdlQWNjZXNzU3RhdHVzKT4mJik7CiAgICAg dm9pZCBncmFudFN0b3JhZ2VBY2Nlc3MoU3RyaW5nJiYgc3ViRnJhbWVIb3N0LCBTdHJpbmcmJiB0 b3BGcmFtZUhvc3QsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgYm9vbCB1c2Vy V2FzUHJvbXB0ZWROb3csIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYpOwogCi0gICAg dm9pZCBsb2dGcmFtZU5hdmlnYXRpb24oY29uc3QgU3RyaW5nJiB0YXJnZXRQcmltYXJ5RG9tYWlu LCBjb25zdCBTdHJpbmcmIG1haW5GcmFtZVByaW1hcnlEb21haW4sIGNvbnN0IFN0cmluZyYgc291 cmNlUHJpbWFyeURvbWFpbiwgY29uc3QgU3RyaW5nJiB0YXJnZXRIb3N0LCBjb25zdCBTdHJpbmcm IG1haW5GcmFtZUhvc3QsIGJvb2wgYXJlVGFyZ2V0QW5kTWFpbkZyYW1lRG9tYWluc0Fzc29jaWF0 ZWQsIGJvb2wgYXJlVGFyZ2V0QW5kU291cmNlRG9tYWluc0Fzc29jaWF0ZWQsIGJvb2wgaXNSZWRp cmVjdCwgYm9vbCBpc01haW5GcmFtZSk7CisgICAgdm9pZCBsb2dGcmFtZU5hdmlnYXRpb24oY29u c3QgU3RyaW5nJiB0YXJnZXRQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJpbmcmIG1haW5GcmFtZVBy aW1hcnlEb21haW4sIGNvbnN0IFN0cmluZyYgc291cmNlUHJpbWFyeURvbWFpbiwgY29uc3QgU3Ry aW5nJiB0YXJnZXRIb3N0LCBjb25zdCBTdHJpbmcmIG1haW5GcmFtZUhvc3QsIGJvb2wgaXNSZWRp cmVjdCwgYm9vbCBpc01haW5GcmFtZSk7CiAgICAgdm9pZCBsb2dVc2VySW50ZXJhY3Rpb24oY29u c3QgU3RyaW5nJiBwcmltYXJ5RG9tYWluKTsKIAogICAgIHZvaWQgY2xlYXJVc2VySW50ZXJhY3Rp b24oY29uc3QgU3RyaW5nJiBwcmltYXJ5RG9tYWluKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCmluZGV4 IDI4NzdjYWQxMTQzMDhjYjJjZWMxZDg2MDVlYzkxNjgwNDQ4NDc5MzMuLmNjNDQ4YTk4MmQzMTk4 YTI2MDAzYzBjNjUxYzFkNmYxM2QwYWI0OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcApAQCAtNTAs MTIgKzUwLDYgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RhdGljIGlubGluZSBTdHJpbmcgaXNv bGF0ZWRQcmltYXJ5RG9tYWluKGNvbnN0IFQmIHZhbHVlKQogICAgIHJldHVybiBSZXNvdXJjZUxv YWRTdGF0aXN0aWNzOjpwcmltYXJ5RG9tYWluKHZhbHVlKS5pc29sYXRlZENvcHkoKTsKIH0KIAot c3RhdGljIGJvb2wgYXJlRG9tYWluc0Fzc29jaWF0ZWQoV2ViUGFnZVByb3h5KiBwYWdlLCBjb25z dCBTdHJpbmcmIGZpcnN0RG9tYWluLCBjb25zdCBTdHJpbmcmIHNlY29uZERvbWFpbikKLXsKLSAg ICBib29sIG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzID0gcGFnZSAmJiBwYWdlLT5wcmVmZXJlbmNl cygpLm5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzKCk7Ci0gICAgcmV0dXJuIFJlc291cmNlTG9hZFN0 YXRpc3RpY3M6OmFyZURvbWFpbnNBc3NvY2lhdGVkKG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzLCBm aXJzdERvbWFpbiwgc2Vjb25kRG9tYWluKTsKLX0KLQogY29uc3QgT3B0aW9uU2V0PFdlYnNpdGVE YXRhVHlwZT4mIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bW9uaXRvcmVkRGF0YVR5 cGVzKCkKIHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8T3B0aW9uU2V0PFdlYnNpdGVEYXRh VHlwZT4+IGRhdGFUeXBlcyhzdGQ6OmluaXRpYWxpemVyX2xpc3Q8V2Vic2l0ZURhdGFUeXBlPih7 CkBAIC0zOTIsMTcgKzM4NiwxNCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZTo6bG9nRnJhbWVOYXZpZ2F0aW9uKGNvbnN0IFdlYkZyYW1lUHJveHkmIGZyYQogICAgIGlmICh0 YXJnZXRIb3N0LmlzRW1wdHkoKSB8fCBtYWluRnJhbWVIb3N0LmlzRW1wdHkoKSB8fCB0YXJnZXRI b3N0ID09IHNvdXJjZVVSTC5ob3N0KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGF1dG8qIHBh Z2UgPSBmcmFtZS5wYWdlKCk7CiAgICAgYXV0byB0YXJnZXRQcmltYXJ5RG9tYWluID0gUmVzb3Vy Y2VMb2FkU3RhdGlzdGljczo6cHJpbWFyeURvbWFpbih0YXJnZXRVUkwpOwogICAgIGF1dG8gbWFp bkZyYW1lUHJpbWFyeURvbWFpbiA9IFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OnByaW1hcnlEb21h aW4ocGFnZVVSTCk7CiAgICAgYXV0byBzb3VyY2VQcmltYXJ5RG9tYWluID0gUmVzb3VyY2VMb2Fk U3RhdGlzdGljczo6cHJpbWFyeURvbWFpbihzb3VyY2VVUkwpOwogCi0gICAgYm9vbCBhcmVUYXJn ZXRBbmRNYWluRnJhbWVEb21haW5zQXNzb2NpYXRlZCA9IGFyZURvbWFpbnNBc3NvY2lhdGVkKHBh Z2UsIHRhcmdldFByaW1hcnlEb21haW4sIG1haW5GcmFtZVByaW1hcnlEb21haW4pOwotICAgIGJv b2wgYXJlVGFyZ2V0QW5kU291cmNlRG9tYWluc0Fzc29jaWF0ZWQgPSBhcmVEb21haW5zQXNzb2Np YXRlZChwYWdlLCB0YXJnZXRQcmltYXJ5RG9tYWluLCBzb3VyY2VQcmltYXJ5RG9tYWluKTsKLQot ICAgIHBvc3RUYXNrKFt0aGlzLCB0YXJnZXRQcmltYXJ5RG9tYWluID0gdGFyZ2V0UHJpbWFyeURv bWFpbi5pc29sYXRlZENvcHkoKSwgbWFpbkZyYW1lUHJpbWFyeURvbWFpbiA9IG1haW5GcmFtZVBy aW1hcnlEb21haW4uaXNvbGF0ZWRDb3B5KCksIHNvdXJjZVByaW1hcnlEb21haW4gPSBzb3VyY2VQ cmltYXJ5RG9tYWluLmlzb2xhdGVkQ29weSgpLCB0YXJnZXRIb3N0ID0gdGFyZ2V0SG9zdC50b1N0 cmluZygpLmlzb2xhdGVkQ29weSgpLCBtYWluRnJhbWVIb3N0ID0gbWFpbkZyYW1lSG9zdC50b1N0 cmluZygpLmlzb2xhdGVkQ29weSgpLCBhcmVUYXJnZXRBbmRNYWluRnJhbWVEb21haW5zQXNzb2Np YXRlZCwgYXJlVGFyZ2V0QW5kU291cmNlRG9tYWluc0Fzc29jaWF0ZWQsIGlzUmVkaXJlY3QsIGlz TWFpbkZyYW1lID0gZnJhbWUuaXNNYWluRnJhbWUoKV0geworICAgIHBvc3RUYXNrKFt0aGlzLCB0 YXJnZXRQcmltYXJ5RG9tYWluID0gdGFyZ2V0UHJpbWFyeURvbWFpbi5pc29sYXRlZENvcHkoKSwg bWFpbkZyYW1lUHJpbWFyeURvbWFpbiA9IG1haW5GcmFtZVByaW1hcnlEb21haW4uaXNvbGF0ZWRD b3B5KCksIHNvdXJjZVByaW1hcnlEb21haW4gPSBzb3VyY2VQcmltYXJ5RG9tYWluLmlzb2xhdGVk Q29weSgpLCB0YXJnZXRIb3N0ID0gdGFyZ2V0SG9zdC50b1N0cmluZygpLmlzb2xhdGVkQ29weSgp LCBtYWluRnJhbWVIb3N0ID0gbWFpbkZyYW1lSG9zdC50b1N0cmluZygpLmlzb2xhdGVkQ29weSgp LCBpc1JlZGlyZWN0LCBpc01haW5GcmFtZSA9IGZyYW1lLmlzTWFpbkZyYW1lKCldIHsKKyAgICAg ICAgCiAgICAgICAgIGlmIChtX21lbW9yeVN0b3JlKQotICAgICAgICAgICAgbV9tZW1vcnlTdG9y ZS0+bG9nRnJhbWVOYXZpZ2F0aW9uKHRhcmdldFByaW1hcnlEb21haW4sIG1haW5GcmFtZVByaW1h cnlEb21haW4sIHNvdXJjZVByaW1hcnlEb21haW4sIHRhcmdldEhvc3QsIG1haW5GcmFtZUhvc3Qs IGFyZVRhcmdldEFuZE1haW5GcmFtZURvbWFpbnNBc3NvY2lhdGVkLCBhcmVUYXJnZXRBbmRTb3Vy Y2VEb21haW5zQXNzb2NpYXRlZCwgaXNSZWRpcmVjdCwgaXNNYWluRnJhbWUpOworICAgICAgICAg ICAgbV9tZW1vcnlTdG9yZS0+bG9nRnJhbWVOYXZpZ2F0aW9uKHRhcmdldFByaW1hcnlEb21haW4s IG1haW5GcmFtZVByaW1hcnlEb21haW4sIHNvdXJjZVByaW1hcnlEb21haW4sIHRhcmdldEhvc3Qs IG1haW5GcmFtZUhvc3QsIGlzUmVkaXJlY3QsIGlzTWFpbkZyYW1lKTsKICAgICB9KTsKIH0KIAo= 347664 2018-08-21 11:40:54 -0700 2018-08-21 12:53:31 -0700 Patch bug-188756-20180821114053.patch text/plain 14419 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDNhODFiNzZhNmQ5YTgz NmM1ZjUxOTc3ZmNmNjE5Yjk2YzdjNjM5My4uODdlMDJiN2U1ZGI0Yzk4ODgwNDUwZmNkYzgwZTFm YjUyMzFkNWFiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA4LTIxICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBleHBlcmlt ZW50YWwgYWZmaWxpYXRlZCBkb21haW4gY29kZSBub3cgdGhhdCBTdG9yYWdlQWNjZXNzIEFQSSBp cyBhdmFpbGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4ODc1NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDM1Mjc4NDg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gQnVnIDE3NDY2MSB3ZSBh ZGRlZCBhIGNvbXBhdGliaWxpdHkgcXVpcmsgdG8gc3VwcG9ydCB3c2ouY29tIGF1dGhlbnRpY2F0 aW9uLiBUaGlzIHF1aXJrIGlzIG5vIGxvbmdlciBuZWVkZWQsCisgICAgICAgIHNpbmNlIHRoZSBT dG9yYWdlQWNjZXNzIEFQSSBwcm92aWRlcyB0aGUgbmVjZXNzYXJ5IHRvb2xzIHRvIGRvIHRoaXMg dHlwZSBvZiBpbnRlcmFjdGlvbiB3aXRob3V0IG5lZWRpbmcgZ2xvYmFsCisgICAgICAgIGNyb3Nz LXNpdGUgYWNjZXNzLgorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJj ZUxvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1dl YlNvY2tldExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6YXJlRG9tYWluc0Fzc29jaWF0ZWQp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkRW5hYmxlU2l0ZVNwZWNpZmljUXVp cmtzKTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjphcmVEb21haW5z QXNzb2NpYXRlZCk6IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3MuaDoKKwogMjAxOC0wOC0yMSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW1dlYkdMXSBDb250ZXh0cyBhcmUgbm90IHVwZGF0ZWQgd2hlbiBkaXNw bGF5IGNvbmZpZ3VyYXRpb24gY2hhbmdlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMDY1NGQ4OWQ0ODczZWRhYTJm ZTA4M2U2YjhhN2U1YmU3M2QyMWRjMy4uM2U5MzQ1NTAxZDM1ZmNmMTgzMjExZjhjNzRmNTJjNjVm MmRkN2Q2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxOC0wOC0yMSAgQnJlbnQgRnVs Z2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgZXhwZXJpbWVudGFs IGFmZmlsaWF0ZWQgZG9tYWluIGNvZGUgbm93IHRoYXQgU3RvcmFnZUFjY2VzcyBBUEkgaXMgYXZh aWxhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODg3NTYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQzNTI3ODQ4PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIEJ1ZyAxNzQ2NjEgd2UgYWRkZWQg YSBjb21wYXRpYmlsaXR5IHF1aXJrIHRvIHN1cHBvcnQgd3NqLmNvbSBhdXRoZW50aWNhdGlvbi4g VGhpcyBxdWlyayBpcyBubyBsb25nZXIgbmVlZGVkLAorICAgICAgICBzaW5jZSB0aGUgU3RvcmFn ZUFjY2VzcyBBUEkgcHJvdmlkZXMgdGhlIG5lY2Vzc2FyeSB0b29scyB0byBkbyB0aGlzIHR5cGUg b2YgaW50ZXJhY3Rpb24gd2l0aG91dCBuZWVkaW5nIGdsb2JhbAorICAgICAgICBjcm9zcy1zaXRl IGFjY2Vzcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVt b3J5U3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVt b3J5U3RvcmU6OmxvZ0ZyYW1lTmF2aWdhdGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL1Jlc291 cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmxvZ0ZyYW1lTmF2aWdhdGlvbik6CisgICAgICAgIChX ZWJLaXQ6OmFyZURvbWFpbnNBc3NvY2lhdGVkKTogRGVsZXRlZC4KKwogMjAxOC0wOC0yMSAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBf V0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi4gc291cmNlQXBwbGljYXRpb25CdW5kbGVJ ZGVudGlmaWVyIGFuZCBzb3VyY2VBcHBsaWNhdGlvblNlY29uZGFyeUlkZW50aWZpZXIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwCmluZGV4IDNhNDQ3 Yzc2ODQ4YjEwYjg0MjZhNjY5ZTkxZjM0YTdlNjkxMmQ0MDIuLjhkMDNiYTA2NzU1ZmE0NTcwNjUw ZjRlNmQ5YjAzYmI2ODQ4M2RmM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9S ZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291 cmNlTG9hZE9ic2VydmVyLmNwcApAQCAtNTYsMjQgKzU2LDYgQEAgUmVzb3VyY2VMb2FkT2JzZXJ2 ZXImIFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWQoKQogICAgIHJldHVybiByZXNvdXJjZUxv YWRPYnNlcnZlcjsKIH0KIAotc3RhdGljIGJvb2wgc2hvdWxkRW5hYmxlU2l0ZVNwZWNpZmljUXVp cmtzKFBhZ2UqIHBhZ2UpCi17Ci0jaWYgUExBVEZPUk0oSU9TKQotICAgIFVOVVNFRF9QQVJBTShw YWdlKTsKLQotICAgIC8vIFRoZXJlIGlzIGN1cnJlbnRseSBubyB3YXkgdG8gdG9nZ2xlIHRoZSBu ZWVkc1NpdGVTcGVjaWZpY1F1aXJrcyBzZXR0aW5nIG9uIGlPUyBzbyB3ZSBhbHdheXMgZW5hYmxl Ci0gICAgLy8gdGhlIHNpdGUtc3BlY2lmaWMgcXVpcmtzIG9uIGlPUy4KLSAgICByZXR1cm4gdHJ1 ZTsKLSNlbHNlCi0gICAgcmV0dXJuIHBhZ2UgJiYgcGFnZS0+c2V0dGluZ3MoKS5uZWVkc1NpdGVT cGVjaWZpY1F1aXJrcygpOwotI2VuZGlmCi19Ci0KLXN0YXRpYyBib29sIGFyZURvbWFpbnNBc3Nv Y2lhdGVkKFBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmluZyYgZmlyc3REb21haW4sIGNvbnN0IFN0cmlu ZyYgc2Vjb25kRG9tYWluKQotewotICAgIHJldHVybiBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjph cmVEb21haW5zQXNzb2NpYXRlZChzaG91bGRFbmFibGVTaXRlU3BlY2lmaWNRdWlya3MocGFnZSks IGZpcnN0RG9tYWluLCBzZWNvbmREb21haW4pOwotfQotCiB2b2lkIFJlc291cmNlTG9hZE9ic2Vy dmVyOjpzZXROb3RpZmljYXRpb25DYWxsYmFjayhXVEY6OkZ1bmN0aW9uPHZvaWQgKFZlY3RvcjxS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzPiYmKT4mJiBub3RpZmljYXRpb25DYWxsYmFjaykKIHsKICAg ICBBU1NFUlQoIW1fbm90aWZpY2F0aW9uQ2FsbGJhY2spOwpAQCAtMTIzLDggKzEwNSw4IEBAIHZv aWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1N1YnJlc291cmNlTG9hZGluZyhjb25zdCBGcmFt ZSogZnJhbWUsIGNvbnN0IFJlc291CiAgICAgYXV0byB0YXJnZXRQcmltYXJ5RG9tYWluID0gcHJp bWFyeURvbWFpbih0YXJnZXRVUkwpOwogICAgIGF1dG8gbWFpbkZyYW1lUHJpbWFyeURvbWFpbiA9 IHByaW1hcnlEb21haW4obWFpbkZyYW1lVVJMKTsKICAgICBhdXRvIHNvdXJjZVByaW1hcnlEb21h aW4gPSBwcmltYXJ5RG9tYWluKHNvdXJjZVVSTCk7Ci0gICAgCi0gICAgaWYgKGFyZURvbWFpbnNB c3NvY2lhdGVkKHBhZ2UsIHRhcmdldFByaW1hcnlEb21haW4sIG1haW5GcmFtZVByaW1hcnlEb21h aW4pIHx8IChpc1JlZGlyZWN0ICYmIGFyZURvbWFpbnNBc3NvY2lhdGVkKHBhZ2UsIHRhcmdldFBy aW1hcnlEb21haW4sIHNvdXJjZVByaW1hcnlEb21haW4pKSkKKworICAgIGlmICh0YXJnZXRQcmlt YXJ5RG9tYWluID09IG1haW5GcmFtZVByaW1hcnlEb21haW4gfHwgKGlzUmVkaXJlY3QgJiYgdGFy Z2V0UHJpbWFyeURvbWFpbiA9PSBzb3VyY2VQcmltYXJ5RG9tYWluKSkKICAgICAgICAgcmV0dXJu OwogCiAgICAgYm9vbCBzaG91bGRDYWxsTm90aWZpY2F0aW9uQ2FsbGJhY2sgPSBmYWxzZTsKQEAg LTE2Myw2ICsxNDUsOSBAQCB2b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dXZWJTb2NrZXRM b2FkaW5nKGNvbnN0IFVSTCYgdGFyZ2V0VVJMLCBjb25zdCBVUkwmCiAgICAgYXV0byB0YXJnZXRQ cmltYXJ5RG9tYWluID0gcHJpbWFyeURvbWFpbih0YXJnZXRVUkwpOwogICAgIGF1dG8gbWFpbkZy YW1lUHJpbWFyeURvbWFpbiA9IHByaW1hcnlEb21haW4obWFpbkZyYW1lVVJMKTsKIAorICAgIGlm ICh0YXJnZXRQcmltYXJ5RG9tYWluID09IG1haW5GcmFtZVByaW1hcnlEb21haW4pCisgICAgICAg IHJldHVybjsKKwogICAgIGF1dG8mIHRhcmdldFN0YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0 YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdldFByaW1hcnlEb21haW4pOwogICAgIHRhcmdl dFN0YXRpc3RpY3MubGFzdFNlZW4gPSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjpyZWR1Y2VUaW1l UmVzb2x1dGlvbihXYWxsVGltZTo6bm93KCkpOwogICAgIGlmICh0YXJnZXRTdGF0aXN0aWNzLnN1 YnJlc291cmNlVW5kZXJUb3BGcmFtZU9yaWdpbnMuYWRkKG1haW5GcmFtZVByaW1hcnlEb21haW4p LmlzTmV3RW50cnkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VM b2FkU3RhdGlzdGljcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3Rh dGlzdGljcy5jcHAKaW5kZXggZDc1NjM5YzYyYzAzODVlNjU1YzZiOTFkOWU5Y2RmMDc0ODQ0M2Fm NC4uOWUyYjdjZjMxNTE5Y2ViMzg1NmMzODYxNmM3NTcyMDcyNGY3MGVkZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmNwcApAQCAtMSw1ICsx LDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTYtMjAxNyBBcHBsZSBJbmMuICBBbGwgcmln aHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE2LTIwMTggQXBwbGUgSW5jLiAgQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzUz LDQwICszNTMsNiBAQCBTdHJpbmcgUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6cHJpbWFyeURvbWFp bihTdHJpbmdWaWV3IGhvc3QpCiAgICAgcmV0dXJuIGhvc3RTdHJpbmc7CiB9CiAKLS8vIEZJWE1F OiBUZW1wb3JhcnkgZml4IGZvciA8cmRhcjovL3Byb2JsZW0vMzIzNDMyNTY+IHVudGlsIGNvbnRl bnQgY2FuIGJlIHVwZGF0ZWQuCi1ib29sIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OmFyZURvbWFp bnNBc3NvY2lhdGVkKGJvb2wgbmVlZHNTaXRlU3BlY2lmaWNRdWlya3MsIGNvbnN0IFN0cmluZyYg Zmlyc3REb21haW4sIGNvbnN0IFN0cmluZyYgc2Vjb25kRG9tYWluKQotewotICAgIEFTU0VSVChp c01haW5UaHJlYWQoKSk7Ci0KLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8SGFzaE1hcDxTdHJp bmcsIHVuc2lnbmVkPj4gbWV0YURvbWFpbklkZW50aWZpZXJzID0gW10gewotICAgICAgICBIYXNo TWFwPFN0cmluZywgdW5zaWduZWQ+IG1hcDsKLQotICAgICAgICAvLyBEb21haW5zIG93bmVkIGJ5 IERvdyBKb25lcyAmIENvbXBhbnksIEluYy4KLSAgICAgICAgY29uc3QgdW5zaWduZWQgZG93Sm9u ZXNJZGVudGlmaWVyID0gMTsKLSAgICAgICAgbWFwLmFkZCgiZG93am9uZXMuY29tIl9zLCBkb3dK b25lc0lkZW50aWZpZXIpOwotICAgICAgICBtYXAuYWRkKCJ3c2ouY29tIl9zLCBkb3dKb25lc0lk ZW50aWZpZXIpOwotICAgICAgICBtYXAuYWRkKCJiYXJyb25zLmNvbSJfcywgZG93Sm9uZXNJZGVu dGlmaWVyKTsKLSAgICAgICAgbWFwLmFkZCgibWFya2V0d2F0Y2guY29tIl9zLCBkb3dKb25lc0lk ZW50aWZpZXIpOwotICAgICAgICBtYXAuYWRkKCJ3c2pwbHVzLmNvbSJfcywgZG93Sm9uZXNJZGVu dGlmaWVyKTsKLQotICAgICAgICByZXR1cm4gbWFwOwotICAgIH0oKTsKLQotICAgIGlmIChmaXJz dERvbWFpbiA9PSBzZWNvbmREb21haW4pCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgQVNT RVJUKCFlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGZpcnN0RG9tYWluLCBzZWNvbmREb21haW4pKTsK LQotICAgIGlmICghbmVlZHNTaXRlU3BlY2lmaWNRdWlya3MpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLQotICAgIHVuc2lnbmVkIGZpcnN0TWV0YURvbWFpbklkZW50aWZpZXIgPSBtZXRhRG9tYWlu SWRlbnRpZmllcnMuZ2V0KCkuZ2V0KGZpcnN0RG9tYWluKTsKLSAgICBpZiAoIWZpcnN0TWV0YURv bWFpbklkZW50aWZpZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiBmaXJz dE1ldGFEb21haW5JZGVudGlmaWVyID09IG1ldGFEb21haW5JZGVudGlmaWVycy5nZXQoKS5nZXQo c2Vjb25kRG9tYWluKTsKLX0KLQogV2FsbFRpbWUgUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6cmVk dWNlVGltZVJlc29sdXRpb24oV2FsbFRpbWUgdGltZSkKIHsKICAgICByZXR1cm4gV2FsbFRpbWU6 OmZyb21SYXdTZWNvbmRzKHN0ZDo6Zmxvb3IodGltZS5zZWNvbmRzU2luY2VFcG9jaCgpIC8gdGlt ZXN0YW1wUmVzb2x1dGlvbikgKiB0aW1lc3RhbXBSZXNvbHV0aW9uLnNlY29uZHMoKSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuaAppbmRleCBlYjlj N2I2OTA2NDkzZGQ5ZTc4YjQ1ZDhjMWI4N2U3NDMxZDliMDMzLi44YzllZDRjMmJhMWZiMzRhNTli NjMyMmQ5YmVlYmFmZjgzYjYyZDQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNv dXJjZUxvYWRTdGF0aXN0aWNzLmgKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChD KSAyMDE2LTIwMTcgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdo dCAoQykgMjAxNi0yMDE4IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTUzLDcgKzUzLDYgQEAgc3RydWN0IFJlc291cmNl TG9hZFN0YXRpc3RpY3MgewogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBTdHJpbmcgcHJpbWFy eURvbWFpbihjb25zdCBVUkwmKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgU3RyaW5nIHBy aW1hcnlEb21haW4oU3RyaW5nVmlldyBob3N0KTsKIAotICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRp YyBib29sIGFyZURvbWFpbnNBc3NvY2lhdGVkKGJvb2wgbmVlZHNTaXRlU3BlY2lmaWNRdWlya3Ms IGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRp YyBXYWxsVGltZSByZWR1Y2VUaW1lUmVzb2x1dGlvbihXYWxsVGltZSk7CiAKICAgICBXRUJDT1JF X0VYUE9SVCB2b2lkIGVuY29kZShLZXllZEVuY29kZXImKSBjb25zdDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5 U3RvcmUuY3BwCmluZGV4IGMyNTM0ZmRmZjI1MzFmYTg3MWE5NTg2MDI4YzI3OGZlMDc1NGU5Njku LjY0ZjlkYjdlMzMyZjdmYzVhZDNmN2UwZjExZTFlNzRlZWRhYzYxMjYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01l bW9yeVN0b3JlLmNwcApAQCAtNjAyLDEwICs2MDIsMTMgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzTWVtb3J5U3RvcmU6OmNhbmNlbFBlbmRpbmdTdGF0aXN0aWNzUHJvY2Vzc2luZ1JlcXVl c3QKICAgICBtX3BlbmRpbmdTdGF0aXN0aWNzUHJvY2Vzc2luZ1JlcXVlc3RJZGVudGlmaWVyID0g c3RkOjpudWxsb3B0OwogfQogCi12b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9y ZTo6bG9nRnJhbWVOYXZpZ2F0aW9uKGNvbnN0IFN0cmluZyYgdGFyZ2V0UHJpbWFyeURvbWFpbiwg Y29uc3QgU3RyaW5nJiBtYWluRnJhbWVQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJpbmcmIHNvdXJj ZVByaW1hcnlEb21haW4sIGNvbnN0IFN0cmluZyYgdGFyZ2V0SG9zdCwgY29uc3QgU3RyaW5nJiBt YWluRnJhbWVIb3N0LCBib29sIGFyZVRhcmdldEFuZE1haW5GcmFtZURvbWFpbnNBc3NvY2lhdGVk LCBib29sIGFyZVRhcmdldEFuZFNvdXJjZURvbWFpbnNBc3NvY2lhdGVkLCBib29sIGlzUmVkaXJl Y3QsIGJvb2wgaXNNYWluRnJhbWUpCit2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlT dG9yZTo6bG9nRnJhbWVOYXZpZ2F0aW9uKGNvbnN0IFN0cmluZyYgdGFyZ2V0UHJpbWFyeURvbWFp biwgY29uc3QgU3RyaW5nJiBtYWluRnJhbWVQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJpbmcmIHNv dXJjZVByaW1hcnlEb21haW4sIGNvbnN0IFN0cmluZyYgdGFyZ2V0SG9zdCwgY29uc3QgU3RyaW5n JiBtYWluRnJhbWVIb3N0LCBib29sIGlzUmVkaXJlY3QsIGJvb2wgaXNNYWluRnJhbWUpCiB7CiAg ICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CiAKKyAgICBib29sIGFyZVRhcmdldEFuZE1h aW5GcmFtZURvbWFpbnNBc3NvY2lhdGVkID0gdGFyZ2V0UHJpbWFyeURvbWFpbiA9PSBtYWluRnJh bWVQcmltYXJ5RG9tYWluOworICAgIGJvb2wgYXJlVGFyZ2V0QW5kU291cmNlRG9tYWluc0Fzc29j aWF0ZWQgPSB0YXJnZXRQcmltYXJ5RG9tYWluID09IHNvdXJjZVByaW1hcnlEb21haW47CisKICAg ICBib29sIHN0YXRpc3RpY3NXZXJlVXBkYXRlZCA9IGZhbHNlOwogICAgIGlmICh0YXJnZXRIb3N0 ICE9IG1haW5GcmFtZUhvc3QgJiYgIShhcmVUYXJnZXRBbmRNYWluRnJhbWVEb21haW5zQXNzb2Np YXRlZCB8fCBhcmVUYXJnZXRBbmRTb3VyY2VEb21haW5zQXNzb2NpYXRlZCkpIHsKICAgICAgICAg YXV0byYgdGFyZ2V0U3RhdGlzdGljcyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1h cnlEb21haW4odGFyZ2V0UHJpbWFyeURvbWFpbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuaCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5oCmluZGV4 IDQwYjM5NGIwOGFhYzExYTljMjQ1N2RmNDRlYTE0NWUyMjgzMzIzODcuLmI3OWYwZmU1MDRmNzky ODNlM2Q2NzA2MDkyZmE4ZTRhMDdkZGM0NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5oCkBAIC0x MjAsNyArMTIwLDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVxdWVzdFN0b3JhZ2VBY2Nlc3MoU3Ry aW5nJiYgc3ViRnJhbWVQcmltYXJ5RG9tYWluLCBTdHJpbmcmJiB0b3BGcmFtZVByaW1hcnlEb21h aW4sIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgYm9vbCBwcm9tcHRFbmFibGVk LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFN0b3JhZ2VBY2Nlc3NTdGF0dXMpPiYmKTsKICAgICB2 b2lkIGdyYW50U3RvcmFnZUFjY2VzcyhTdHJpbmcmJiBzdWJGcmFtZUhvc3QsIFN0cmluZyYmIHRv cEZyYW1lSG9zdCwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCBib29sIHVzZXJX YXNQcm9tcHRlZE5vdywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJik7CiAKLSAgICB2 b2lkIGxvZ0ZyYW1lTmF2aWdhdGlvbihjb25zdCBTdHJpbmcmIHRhcmdldFByaW1hcnlEb21haW4s IGNvbnN0IFN0cmluZyYgbWFpbkZyYW1lUHJpbWFyeURvbWFpbiwgY29uc3QgU3RyaW5nJiBzb3Vy Y2VQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJpbmcmIHRhcmdldEhvc3QsIGNvbnN0IFN0cmluZyYg bWFpbkZyYW1lSG9zdCwgYm9vbCBhcmVUYXJnZXRBbmRNYWluRnJhbWVEb21haW5zQXNzb2NpYXRl ZCwgYm9vbCBhcmVUYXJnZXRBbmRTb3VyY2VEb21haW5zQXNzb2NpYXRlZCwgYm9vbCBpc1JlZGly ZWN0LCBib29sIGlzTWFpbkZyYW1lKTsKKyAgICB2b2lkIGxvZ0ZyYW1lTmF2aWdhdGlvbihjb25z dCBTdHJpbmcmIHRhcmdldFByaW1hcnlEb21haW4sIGNvbnN0IFN0cmluZyYgbWFpbkZyYW1lUHJp bWFyeURvbWFpbiwgY29uc3QgU3RyaW5nJiBzb3VyY2VQcmltYXJ5RG9tYWluLCBjb25zdCBTdHJp bmcmIHRhcmdldEhvc3QsIGNvbnN0IFN0cmluZyYgbWFpbkZyYW1lSG9zdCwgYm9vbCBpc1JlZGly ZWN0LCBib29sIGlzTWFpbkZyYW1lKTsKICAgICB2b2lkIGxvZ1VzZXJJbnRlcmFjdGlvbihjb25z dCBTdHJpbmcmIHByaW1hcnlEb21haW4pOwogCiAgICAgdm9pZCBjbGVhclVzZXJJbnRlcmFjdGlv bihjb25zdCBTdHJpbmcmIHByaW1hcnlEb21haW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXgg OGQwMzcyMWQwYTA5ZmUwNzYwZjI3Yzg5OGFiNjMzNDA1Njc0ZmY0Mi4uNmNkOWRjNGI3ZDc0ZTAw ODc5MDFiMDU5MDNiM2JkMjMzNmE3YTQwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCkBAIC01MCwx MiArNTAsNiBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdGF0aWMgaW5saW5lIFN0cmluZyBpc29s YXRlZFByaW1hcnlEb21haW4oY29uc3QgVCYgdmFsdWUpCiAgICAgcmV0dXJuIFJlc291cmNlTG9h ZFN0YXRpc3RpY3M6OnByaW1hcnlEb21haW4odmFsdWUpLmlzb2xhdGVkQ29weSgpOwogfQogCi1z dGF0aWMgYm9vbCBhcmVEb21haW5zQXNzb2NpYXRlZChXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0 IFN0cmluZyYgZmlyc3REb21haW4sIGNvbnN0IFN0cmluZyYgc2Vjb25kRG9tYWluKQotewotICAg IGJvb2wgbmVlZHNTaXRlU3BlY2lmaWNRdWlya3MgPSBwYWdlICYmIHBhZ2UtPnByZWZlcmVuY2Vz KCkubmVlZHNTaXRlU3BlY2lmaWNRdWlya3MoKTsKLSAgICByZXR1cm4gUmVzb3VyY2VMb2FkU3Rh dGlzdGljczo6YXJlRG9tYWluc0Fzc29jaWF0ZWQobmVlZHNTaXRlU3BlY2lmaWNRdWlya3MsIGZp cnN0RG9tYWluLCBzZWNvbmREb21haW4pOwotfQotCiBjb25zdCBPcHRpb25TZXQ8V2Vic2l0ZURh dGFUeXBlPiYgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjptb25pdG9yZWREYXRhVHlw ZXMoKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxPcHRpb25TZXQ8V2Vic2l0ZURhdGFU eXBlPj4gZGF0YVR5cGVzKHN0ZDo6aW5pdGlhbGl6ZXJfbGlzdDxXZWJzaXRlRGF0YVR5cGU+KHsK QEAgLTM5MiwxNyArMzg2LDE0IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl Ojpsb2dGcmFtZU5hdmlnYXRpb24oY29uc3QgV2ViRnJhbWVQcm94eSYgZnJhCiAgICAgaWYgKHRh cmdldEhvc3QuaXNFbXB0eSgpIHx8IG1haW5GcmFtZUhvc3QuaXNFbXB0eSgpIHx8IHRhcmdldEhv c3QgPT0gc291cmNlVVJMLmhvc3QoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgYXV0byogcGFn ZSA9IGZyYW1lLnBhZ2UoKTsKICAgICBhdXRvIHRhcmdldFByaW1hcnlEb21haW4gPSBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzOjpwcmltYXJ5RG9tYWluKHRhcmdldFVSTCk7CiAgICAgYXV0byBtYWlu RnJhbWVQcmltYXJ5RG9tYWluID0gUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6cHJpbWFyeURvbWFp bihwYWdlVVJMKTsKICAgICBhdXRvIHNvdXJjZVByaW1hcnlEb21haW4gPSBSZXNvdXJjZUxvYWRT dGF0aXN0aWNzOjpwcmltYXJ5RG9tYWluKHNvdXJjZVVSTCk7CiAKLSAgICBib29sIGFyZVRhcmdl dEFuZE1haW5GcmFtZURvbWFpbnNBc3NvY2lhdGVkID0gYXJlRG9tYWluc0Fzc29jaWF0ZWQocGFn ZSwgdGFyZ2V0UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1lUHJpbWFyeURvbWFpbik7Ci0gICAgYm9v bCBhcmVUYXJnZXRBbmRTb3VyY2VEb21haW5zQXNzb2NpYXRlZCA9IGFyZURvbWFpbnNBc3NvY2lh dGVkKHBhZ2UsIHRhcmdldFByaW1hcnlEb21haW4sIHNvdXJjZVByaW1hcnlEb21haW4pOwotCi0g ICAgcG9zdFRhc2soW3RoaXMsIHRhcmdldFByaW1hcnlEb21haW4gPSB0YXJnZXRQcmltYXJ5RG9t YWluLmlzb2xhdGVkQ29weSgpLCBtYWluRnJhbWVQcmltYXJ5RG9tYWluID0gbWFpbkZyYW1lUHJp bWFyeURvbWFpbi5pc29sYXRlZENvcHkoKSwgc291cmNlUHJpbWFyeURvbWFpbiA9IHNvdXJjZVBy aW1hcnlEb21haW4uaXNvbGF0ZWRDb3B5KCksIHRhcmdldEhvc3QgPSB0YXJnZXRIb3N0LnRvU3Ry aW5nKCkuaXNvbGF0ZWRDb3B5KCksIG1haW5GcmFtZUhvc3QgPSBtYWluRnJhbWVIb3N0LnRvU3Ry aW5nKCkuaXNvbGF0ZWRDb3B5KCksIGFyZVRhcmdldEFuZE1haW5GcmFtZURvbWFpbnNBc3NvY2lh dGVkLCBhcmVUYXJnZXRBbmRTb3VyY2VEb21haW5zQXNzb2NpYXRlZCwgaXNSZWRpcmVjdCwgaXNN YWluRnJhbWUgPSBmcmFtZS5pc01haW5GcmFtZSgpXSB7CisgICAgcG9zdFRhc2soW3RoaXMsIHRh cmdldFByaW1hcnlEb21haW4gPSB0YXJnZXRQcmltYXJ5RG9tYWluLmlzb2xhdGVkQ29weSgpLCBt YWluRnJhbWVQcmltYXJ5RG9tYWluID0gbWFpbkZyYW1lUHJpbWFyeURvbWFpbi5pc29sYXRlZENv cHkoKSwgc291cmNlUHJpbWFyeURvbWFpbiA9IHNvdXJjZVByaW1hcnlEb21haW4uaXNvbGF0ZWRD b3B5KCksIHRhcmdldEhvc3QgPSB0YXJnZXRIb3N0LnRvU3RyaW5nKCkuaXNvbGF0ZWRDb3B5KCks IG1haW5GcmFtZUhvc3QgPSBtYWluRnJhbWVIb3N0LnRvU3RyaW5nKCkuaXNvbGF0ZWRDb3B5KCks IGlzUmVkaXJlY3QsIGlzTWFpbkZyYW1lID0gZnJhbWUuaXNNYWluRnJhbWUoKV0geworICAgICAg ICAKICAgICAgICAgaWYgKG1fbWVtb3J5U3RvcmUpCi0gICAgICAgICAgICBtX21lbW9yeVN0b3Jl LT5sb2dGcmFtZU5hdmlnYXRpb24odGFyZ2V0UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1lUHJpbWFy eURvbWFpbiwgc291cmNlUHJpbWFyeURvbWFpbiwgdGFyZ2V0SG9zdCwgbWFpbkZyYW1lSG9zdCwg YXJlVGFyZ2V0QW5kTWFpbkZyYW1lRG9tYWluc0Fzc29jaWF0ZWQsIGFyZVRhcmdldEFuZFNvdXJj ZURvbWFpbnNBc3NvY2lhdGVkLCBpc1JlZGlyZWN0LCBpc01haW5GcmFtZSk7CisgICAgICAgICAg ICBtX21lbW9yeVN0b3JlLT5sb2dGcmFtZU5hdmlnYXRpb24odGFyZ2V0UHJpbWFyeURvbWFpbiwg bWFpbkZyYW1lUHJpbWFyeURvbWFpbiwgc291cmNlUHJpbWFyeURvbWFpbiwgdGFyZ2V0SG9zdCwg bWFpbkZyYW1lSG9zdCwgaXNSZWRpcmVjdCwgaXNNYWluRnJhbWUpOwogICAgIH0pOwogfQogCg==