196738 2019-04-09 11:03:28 -0700 [Apple Pay] Add release logging to PaymentCoordinator 2019-04-09 12:54:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes achristensen beidson bfulgham cdumez commit-queue dino thorton webkit-bug-importer youennf oldest_to_newest 1525680 0 aestes 2019-04-09 11:03:28 -0700 [Apple Pay] Add release logging to PaymentCoordinator 1525687 1 367055 aestes 2019-04-09 11:11:01 -0700 Created attachment 367055 Patch 1525724 2 367055 commit-queue 2019-04-09 12:53:41 -0700 Comment on attachment 367055 Patch Clearing flags on attachment: 367055 Committed r244092: <https://trac.webkit.org/changeset/244092> 1525725 3 commit-queue 2019-04-09 12:53:43 -0700 All reviewed patches have been landed. Closing bug. 1525726 4 webkit-bug-importer 2019-04-09 12:54:21 -0700 <rdar://problem/49746270> 367055 2019-04-09 11:11:01 -0700 2019-04-09 12:53:41 -0700 Patch bug-196738-20190409111100.patch text/plain 14896 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDUzMjA3MmQyNTE2YTI1 YTE2ZWY3ODY2MTNmMjBjZTQ3M2QzOGFmMy4uNDMyZWVlNDNlODE3MzcyNWQ0YTRiNjYwNTFjMTE4 Mzc3ZjYwNWZkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE5LTA0LTA5ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbQXBwbGUgUGF5XSBBZGQgcmVs ZWFzZSBsb2dnaW5nIHRvIFBheW1lbnRDb29yZGluYXRvcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NzM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBhbGxvd2VkLCBsb2cgaW50ZXJhY3Rpb25z IHdpdGggUGF5bWVudENvb3JkaW5hdG9yIHRvIG9zX2xvZyB0byBoZWxwIGRpYWdub3NlIEFwcGxl IFBheSBidWdzLgorCisgICAgICAgIFRoZSBmb2xsb3dpbmcgaW5mb3JtYXRpb24gbWlnaHQgYmUg bG9nZ2VkOiBuYW1lcyBvZiBmdW5jdGlvbnMgY2FsbGVkLCBtZXJjaGFudCBBUEkgdmVyc2lvbnMs CisgICAgICAgIGJvb2xlYW4gcmVzdWx0cyBvZiBjYW5NYWtlUGF5bWVudHMoKSwgYm9vbGVhbiBy ZXN1bHRzIG9mIGJlZ2luUGF5bWVudFNlc3Npb24oKSwgd2hldGhlcgorICAgICAgICBjb21wbGV0 ZVBheW1lbnRTZXNzaW9uKCkgd2FzIGNhbGxlZCB3aXRoIGEgZmluYWwgc3RhdGUgcmVzdWx0LCBi b29sZWFuIHJlc3VsdHMgb2YKKyAgICAgICAgc2hvdWxkQWxsb3dBcHBsZVBheSgpLCB3aGV0aGVy IGEgZG9jdW1lbnQgaGFzIGV2YWx1YXRlZCB1c2VyIGFnZW50IHNjcmlwdHMgb3IgaXMgcnVubmlu ZworICAgICAgICB1c2VyIHNjcmlwdHMsIGFuZCB3aGV0aGVyIGEgY2xpZW50IHN1cHBvcnRzIHVu cmVzdHJpY3RlZCBBcHBsZSBQYXkuCisKKyAgICAgICAgKiBNb2R1bGVzL2FwcGxlcGF5L1BheW1l bnRDb29yZGluYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50Q29vcmRpbmF0b3I6 OnN1cHBvcnRzVmVyc2lvbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50Q29vcmRp bmF0b3I6OmNhbk1ha2VQYXltZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50Q29vcmRp bmF0b3I6OmNhbk1ha2VQYXltZW50c1dpdGhBY3RpdmVDYXJkKToKKyAgICAgICAgKFdlYkNvcmU6 OlBheW1lbnRDb29yZGluYXRvcjo6b3BlblBheW1lbnRTZXR1cCk6CisgICAgICAgIChXZWJDb3Jl OjpQYXltZW50Q29vcmRpbmF0b3I6OmJlZ2luUGF5bWVudFNlc3Npb24pOgorICAgICAgICAoV2Vi Q29yZTo6UGF5bWVudENvb3JkaW5hdG9yOjpjb21wbGV0ZU1lcmNoYW50VmFsaWRhdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpQYXltZW50Q29vcmRpbmF0b3I6OmNvbXBsZXRlU2hpcHBpbmdNZXRo b2RTZWxlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6UGF5bWVudENvb3JkaW5hdG9yOjpjb21w bGV0ZVNoaXBwaW5nQ29udGFjdFNlbGVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50 Q29vcmRpbmF0b3I6OmNvbXBsZXRlUGF5bWVudE1ldGhvZFNlbGVjdGlvbik6CisgICAgICAgIChX ZWJDb3JlOjpQYXltZW50Q29vcmRpbmF0b3I6OmNvbXBsZXRlUGF5bWVudFNlc3Npb24pOgorICAg ICAgICAoV2ViQ29yZTo6UGF5bWVudENvb3JkaW5hdG9yOjphYm9ydFBheW1lbnRTZXNzaW9uKToK KyAgICAgICAgKFdlYkNvcmU6OlBheW1lbnRDb29yZGluYXRvcjo6Y2FuY2VsUGF5bWVudFNlc3Np b24pOgorICAgICAgICAoV2ViQ29yZTo6UGF5bWVudENvb3JkaW5hdG9yOjp2YWxpZGF0ZU1lcmNo YW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBheW1lbnRDb29yZGluYXRvcjo6ZGlkQXV0aG9yaXpl UGF5bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50Q29vcmRpbmF0b3I6OmRpZFNlbGVj dFBheW1lbnRNZXRob2QpOgorICAgICAgICAoV2ViQ29yZTo6UGF5bWVudENvb3JkaW5hdG9yOjpk aWRTZWxlY3RTaGlwcGluZ01ldGhvZCk6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50Q29vcmRp bmF0b3I6OmRpZFNlbGVjdFNoaXBwaW5nQ29udGFjdCk6CisgICAgICAgIChXZWJDb3JlOjpQYXlt ZW50Q29vcmRpbmF0b3I6OmRpZENhbmNlbFBheW1lbnRTZXNzaW9uKToKKyAgICAgICAgKFdlYkNv cmU6OlBheW1lbnRDb29yZGluYXRvcjo6c2hvdWxkQWxsb3dBcHBsZVBheSBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpQYXltZW50Q29vcmRpbmF0b3I6OnNob3VsZEFsbG93VXNlckFnZW50U2Ny aXB0cyBjb25zdCk6CisgICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9QYXltZW50Q29vcmRpbmF0 b3JDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBheW1lbnRDb29yZGluYXRvckNsaWVudDo6 aXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkIGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9Mb2dn aW5nLmg6CisgICAgICAgICogdGVzdGluZy9Nb2NrUGF5bWVudENvb3JkaW5hdG9yLmg6CisKIDIw MTktMDQtMDkgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgVGVz dCBmb3I6IDE5NjA5NSBJbmJhbmQgVGV4dCBUcmFjayBjdWVzIGludGVyc3BlcnNlZCB3aXRoIERh dGEgY3VlcyBjYW4gZGlzcGxheSBvdXQgb2Ygb3JkZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDgzZmViOGQ3M2Rl YWUxYjJlYTNlZjdlNTY3ZTUxN2I2NTUyNTk4OGEuLjZmYTQ1NDlkNDQyYmJkYmI4YmI1ZWNiMGFj M2JmNTYwYmM1MjQ1ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDQtMDkgIEFu ZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtBcHBsZSBQYXldIEFkZCBy ZWxlYXNlIGxvZ2dpbmcgdG8gUGF5bWVudENvb3JkaW5hdG9yCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY3MzgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5 bWVudENvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGF5bWVudENvb3JkaW5h dG9yOjppc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQgY29uc3QpOgorICAgICAgICAqIFdlYlByb2Nl c3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9yLmg6CisKIDIwMTktMDQtMDkgIFNpaHVp IExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHVubmVjZXNzYXJ5 IG5ldHdvcmsgcHJvY2VzcyBhc3NlcnRpb24gZm9yIElEQiBjbG9zZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9QYXltZW50Q29vcmRpbmF0b3IuY3BwIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9QYXltZW50Q29vcmRpbmF0b3IuY3BwCmluZGV4 IGY4NzdmZGU0NjZmMzNkYzY4MzZiNzgzNTAxN2E5OGY5Y2U0ZTgzYTQuLjUyNGY0MzY1OThjMjI4 NDVmYTUzYzcxNjY0OWU3NTQ2OGMzNmNmMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvYXBwbGVwYXkvUGF5bWVudENvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRDb29yZGluYXRvci5jcHAKQEAgLTMwLDEyICszMCwx OCBAQAogCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJMaW5rSWNvbkNvbGxlY3Rv ci5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJQYXltZW50QXV0aG9yaXphdGlv blN0YXR1cy5oIgogI2luY2x1ZGUgIlBheW1lbnRDb29yZGluYXRvckNsaWVudC5oIgogI2luY2x1 ZGUgIlBheW1lbnRTZXNzaW9uLmgiCiAjaW5jbHVkZSA8d3RmL0NvbXBsZXRpb25IYW5kbGVyLmg+ CiAjaW5jbHVkZSA8d3RmL1VSTC5oPgogCisjdW5kZWYgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxM T1dFRAorI3VuZGVmIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQKKyNkZWZpbmUgUkVMRUFTRV9MT0df RVJST1JfSUZfQUxMT1dFRChmbXQsIC4uLikgUkVMRUFTRV9MT0dfRVJST1JfSUYobV9jbGllbnQu aXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIEFwcGxlUGF5LCAiJXAgLSBQYXltZW50Q29vcmRp bmF0b3I6OiIgZm10LCB0aGlzLCAjI19fVkFfQVJHU19fKQorI2RlZmluZSBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKGZtdCwgLi4uKSBSRUxFQVNFX0xPR19JRihtX2NsaWVudC5pc0Fsd2F5c09uTG9n Z2luZ0FsbG93ZWQoKSwgQXBwbGVQYXksICIlcCAtIFBheW1lbnRDb29yZGluYXRvcjo6IiBmbXQs IHRoaXMsICMjX19WQV9BUkdTX18pCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogUGF5bWVudENv b3JkaW5hdG9yOjpQYXltZW50Q29vcmRpbmF0b3IoUGF5bWVudENvb3JkaW5hdG9yQ2xpZW50JiBj bGllbnQpCkBAIC01MiwyMCArNTgsMjggQEAgYm9vbCBQYXltZW50Q29vcmRpbmF0b3I6OnN1cHBv cnRzVmVyc2lvbihEb2N1bWVudCYgZG9jdW1lbnQsIHVuc2lnbmVkIHZlcnNpb24pIGMKIHsKICAg ICBpZiAoIXNob3VsZEFsbG93QXBwbGVQYXkoZG9jdW1lbnQpKQogICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgcmV0dXJuIG1fY2xpZW50LnN1cHBvcnRzVmVyc2lvbih2ZXJzaW9uKTsKKworICAg IGF1dG8gc3VwcG9ydHNWZXJzaW9uID0gbV9jbGllbnQuc3VwcG9ydHNWZXJzaW9uKHZlcnNpb24p OworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN1cHBvcnRzVmVyc2lvbiglZCkgLT4gJWQi LCB2ZXJzaW9uLCBzdXBwb3J0c1ZlcnNpb24pOworICAgIHJldHVybiBzdXBwb3J0c1ZlcnNpb247 CiB9CiAKIGJvb2wgUGF5bWVudENvb3JkaW5hdG9yOjpjYW5NYWtlUGF5bWVudHMoRG9jdW1lbnQm IGRvY3VtZW50KQogewogICAgIGlmICghc2hvdWxkQWxsb3dBcHBsZVBheShkb2N1bWVudCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXR1cm4gbV9jbGllbnQuY2FuTWFrZVBheW1lbnRz KCk7CisKKyAgICBhdXRvIGNhbk1ha2VQYXltZW50cyA9IG1fY2xpZW50LmNhbk1ha2VQYXltZW50 cygpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImNhbk1ha2VQYXltZW50cygpIC0+ICVk IiwgY2FuTWFrZVBheW1lbnRzKTsKKyAgICByZXR1cm4gY2FuTWFrZVBheW1lbnRzOwogfQogCiB2 b2lkIFBheW1lbnRDb29yZGluYXRvcjo6Y2FuTWFrZVBheW1lbnRzV2l0aEFjdGl2ZUNhcmQoRG9j dW1lbnQmIGRvY3VtZW50LCBjb25zdCBTdHJpbmcmIG1lcmNoYW50SWRlbnRpZmllciwgV1RGOjpG dW5jdGlvbjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIGlmICghc2hv dWxkQWxsb3dBcHBsZVBheShkb2N1bWVudCkpCiAgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFu ZGxlcihmYWxzZSk7CisKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJjYW5NYWtlUGF5bWVu dHNXaXRoQWN0aXZlQ2FyZCgpIik7CiAgICAgbV9jbGllbnQuY2FuTWFrZVBheW1lbnRzV2l0aEFj dGl2ZUNhcmQobWVyY2hhbnRJZGVudGlmaWVyLCBkb2N1bWVudC5kb21haW4oKSwgV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcikpOwogfQogCkBAIC03Myw2ICs4Nyw4IEBAIHZvaWQgUGF5bWVudENv b3JkaW5hdG9yOjpvcGVuUGF5bWVudFNldHVwKERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgU3Ry aW5nJiBtZXJjCiB7CiAgICAgaWYgKCFzaG91bGRBbGxvd0FwcGxlUGF5KGRvY3VtZW50KSkKICAg ICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKGZhbHNlKTsKKworICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoIm9wZW5QYXltZW50U2V0dXAoKSIpOwogICAgIG1fY2xpZW50Lm9wZW5QYXlt ZW50U2V0dXAobWVyY2hhbnRJZGVudGlmaWVyLCBkb2N1bWVudC5kb21haW4oKSwgV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcikpOwogfQogCkBAIC04Nyw3ICsxMDMsOSBAQCBib29sIFBheW1lbnRD b29yZGluYXRvcjo6YmVnaW5QYXltZW50U2Vzc2lvbihEb2N1bWVudCYgZG9jdW1lbnQsIFBheW1l bnRTZXNzaW9uJgogICAgIGZvciAoYXV0byYgaWNvbiA6IExpbmtJY29uQ29sbGVjdG9yIHsgZG9j dW1lbnQgfS5pY29uc09mVHlwZXMoeyBMaW5rSWNvblR5cGU6OlRvdWNoSWNvbiwgTGlua0ljb25U eXBlOjpUb3VjaFByZWNvbXBvc2VkSWNvbiB9KSkKICAgICAgICAgbGlua0ljb25VUkxzLmFwcGVu ZChpY29uLnVybCk7CiAKLSAgICBpZiAoIW1fY2xpZW50LnNob3dQYXltZW50VUkoZG9jdW1lbnQu dXJsKCksIGxpbmtJY29uVVJMcywgcGF5bWVudFJlcXVlc3QpKQorICAgIGF1dG8gc2hvd1BheW1l bnRVSSA9IG1fY2xpZW50LnNob3dQYXltZW50VUkoZG9jdW1lbnQudXJsKCksIGxpbmtJY29uVVJM cywgcGF5bWVudFJlcXVlc3QpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImJlZ2luUGF5 bWVudFNlc3Npb24oKSAtPiAlZCIsIHNob3dQYXltZW50VUkpOworICAgIGlmICghc2hvd1BheW1l bnRVSSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgbV9hY3RpdmVTZXNzaW9uID0gJnBh eW1lbnRTZXNzaW9uOwpAQCAtOTgsMjggKzExNiwyOCBAQCBib29sIFBheW1lbnRDb29yZGluYXRv cjo6YmVnaW5QYXltZW50U2Vzc2lvbihEb2N1bWVudCYgZG9jdW1lbnQsIFBheW1lbnRTZXNzaW9u Jgogdm9pZCBQYXltZW50Q29vcmRpbmF0b3I6OmNvbXBsZXRlTWVyY2hhbnRWYWxpZGF0aW9uKGNv bnN0IFBheW1lbnRNZXJjaGFudFNlc3Npb24mIHBheW1lbnRNZXJjaGFudFNlc3Npb24pCiB7CiAg ICAgQVNTRVJUKG1fYWN0aXZlU2Vzc2lvbik7Ci0KKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KCJjb21wbGV0ZU1lcmNoYW50VmFsaWRhdGlvbigpIik7CiAgICAgbV9jbGllbnQuY29tcGxldGVN ZXJjaGFudFZhbGlkYXRpb24ocGF5bWVudE1lcmNoYW50U2Vzc2lvbik7CiB9CiAKIHZvaWQgUGF5 bWVudENvb3JkaW5hdG9yOjpjb21wbGV0ZVNoaXBwaW5nTWV0aG9kU2VsZWN0aW9uKE9wdGlvbmFs PFNoaXBwaW5nTWV0aG9kVXBkYXRlPiYmIHVwZGF0ZSkKIHsKICAgICBBU1NFUlQobV9hY3RpdmVT ZXNzaW9uKTsKLQorICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImNvbXBsZXRlU2hpcHBpbmdN ZXRob2RTZWxlY3Rpb24oKSIpOwogICAgIG1fY2xpZW50LmNvbXBsZXRlU2hpcHBpbmdNZXRob2RT ZWxlY3Rpb24oV1RGTW92ZSh1cGRhdGUpKTsKIH0KIAogdm9pZCBQYXltZW50Q29vcmRpbmF0b3I6 OmNvbXBsZXRlU2hpcHBpbmdDb250YWN0U2VsZWN0aW9uKE9wdGlvbmFsPFNoaXBwaW5nQ29udGFj dFVwZGF0ZT4mJiB1cGRhdGUpCiB7CiAgICAgQVNTRVJUKG1fYWN0aXZlU2Vzc2lvbik7Ci0KKyAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJjb21wbGV0ZVNoaXBwaW5nQ29udGFjdFNlbGVjdGlv bigpIik7CiAgICAgbV9jbGllbnQuY29tcGxldGVTaGlwcGluZ0NvbnRhY3RTZWxlY3Rpb24oV1RG TW92ZSh1cGRhdGUpKTsKIH0KIAogdm9pZCBQYXltZW50Q29vcmRpbmF0b3I6OmNvbXBsZXRlUGF5 bWVudE1ldGhvZFNlbGVjdGlvbihPcHRpb25hbDxQYXltZW50TWV0aG9kVXBkYXRlPiYmIHVwZGF0 ZSkKIHsKICAgICBBU1NFUlQobV9hY3RpdmVTZXNzaW9uKTsKLQorICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoImNvbXBsZXRlUGF5bWVudE1ldGhvZFNlbGVjdGlvbigpIik7CiAgICAgbV9jbGll bnQuY29tcGxldGVQYXltZW50TWV0aG9kU2VsZWN0aW9uKFdURk1vdmUodXBkYXRlKSk7CiB9CiAK QEAgLTEyOCw3ICsxNDYsNyBAQCB2b2lkIFBheW1lbnRDb29yZGluYXRvcjo6Y29tcGxldGVQYXlt ZW50U2Vzc2lvbihPcHRpb25hbDxQYXltZW50QXV0aG9yaXphdGlvblJlcwogICAgIEFTU0VSVCht X2FjdGl2ZVNlc3Npb24pOwogCiAgICAgYm9vbCBpc0ZpbmFsU3RhdGUgPSBpc0ZpbmFsU3RhdGVS ZXN1bHQocmVzdWx0KTsKLQorICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImNvbXBsZXRlUGF5 bWVudFNlc3Npb24oKSAoaXNGaW5hbFN0YXRlOiAlZCkiLCBpc0ZpbmFsU3RhdGUpOwogICAgIG1f Y2xpZW50LmNvbXBsZXRlUGF5bWVudFNlc3Npb24oV1RGTW92ZShyZXN1bHQpKTsKIAogICAgIGlm ICghaXNGaW5hbFN0YXRlKQpAQCAtMTQwLDcgKzE1OCw3IEBAIHZvaWQgUGF5bWVudENvb3JkaW5h dG9yOjpjb21wbGV0ZVBheW1lbnRTZXNzaW9uKE9wdGlvbmFsPFBheW1lbnRBdXRob3JpemF0aW9u UmVzCiB2b2lkIFBheW1lbnRDb29yZGluYXRvcjo6YWJvcnRQYXltZW50U2Vzc2lvbigpCiB7CiAg ICAgQVNTRVJUKG1fYWN0aXZlU2Vzc2lvbik7Ci0KKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KCJhYm9ydFBheW1lbnRTZXNzaW9uKCkiKTsKICAgICBtX2NsaWVudC5hYm9ydFBheW1lbnRTZXNz aW9uKCk7CiAgICAgbV9hY3RpdmVTZXNzaW9uID0gbnVsbHB0cjsKIH0KQEAgLTE0OCw3ICsxNjYs NyBAQCB2b2lkIFBheW1lbnRDb29yZGluYXRvcjo6YWJvcnRQYXltZW50U2Vzc2lvbigpCiB2b2lk IFBheW1lbnRDb29yZGluYXRvcjo6Y2FuY2VsUGF5bWVudFNlc3Npb24oKQogewogICAgIEFTU0VS VChtX2FjdGl2ZVNlc3Npb24pOwotCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiY2FuY2Vs UGF5bWVudFNlc3Npb24oKSIpOwogICAgIG1fY2xpZW50LmNhbmNlbFBheW1lbnRTZXNzaW9uKCk7 CiB9CiAKQEAgLTE1OSw2ICsxNzcsNyBAQCB2b2lkIFBheW1lbnRDb29yZGluYXRvcjo6dmFsaWRh dGVNZXJjaGFudChVUkwmJiB2YWxpZGF0aW9uVVJMKQogICAgICAgICByZXR1cm47CiAgICAgfQog CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgidmFsaWRhdGVNZXJjaGFudCgpIik7CiAgICAg bV9hY3RpdmVTZXNzaW9uLT52YWxpZGF0ZU1lcmNoYW50KFdURk1vdmUodmFsaWRhdGlvblVSTCkp OwogfQogCkBAIC0xNjksNiArMTg4LDcgQEAgdm9pZCBQYXltZW50Q29vcmRpbmF0b3I6OmRpZEF1 dGhvcml6ZVBheW1lbnQoY29uc3QgUGF5bWVudCYgcGF5bWVudCkKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAorICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInZhbGlkYXRlTWVyY2hhbnQoKSIp OwogICAgIG1fYWN0aXZlU2Vzc2lvbi0+ZGlkQXV0aG9yaXplUGF5bWVudChwYXltZW50KTsKIH0K IApAQCAtMTc5LDYgKzE5OSw3IEBAIHZvaWQgUGF5bWVudENvb3JkaW5hdG9yOjpkaWRTZWxlY3RQ YXltZW50TWV0aG9kKGNvbnN0IFBheW1lbnRNZXRob2QmIHBheW1lbnRNZXRoCiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRTZWxlY3RQYXlt ZW50TWV0aG9kKCkiKTsKICAgICBtX2FjdGl2ZVNlc3Npb24tPmRpZFNlbGVjdFBheW1lbnRNZXRo b2QocGF5bWVudE1ldGhvZCk7CiB9CiAKQEAgLTE4OSw2ICsyMTAsNyBAQCB2b2lkIFBheW1lbnRD b29yZGluYXRvcjo6ZGlkU2VsZWN0U2hpcHBpbmdNZXRob2QoY29uc3QgQXBwbGVQYXlTZXNzaW9u UGF5bWVudFJlcQogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgUkVMRUFTRV9MT0dfSUZf QUxMT1dFRCgiZGlkU2VsZWN0U2hpcHBpbmdNZXRob2QoKSIpOwogICAgIG1fYWN0aXZlU2Vzc2lv bi0+ZGlkU2VsZWN0U2hpcHBpbmdNZXRob2Qoc2hpcHBpbmdNZXRob2QpOwogfQogCkBAIC0xOTks NiArMjIxLDcgQEAgdm9pZCBQYXltZW50Q29vcmRpbmF0b3I6OmRpZFNlbGVjdFNoaXBwaW5nQ29u dGFjdChjb25zdCBQYXltZW50Q29udGFjdCYgc2hpcHBpbmcKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAorICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZFNlbGVjdFNoaXBwaW5nQ29udGFj dCgpIik7CiAgICAgbV9hY3RpdmVTZXNzaW9uLT5kaWRTZWxlY3RTaGlwcGluZ0NvbnRhY3Qoc2hp cHBpbmdDb250YWN0KTsKIH0KIApAQCAtMjA5LDYgKzIzMiw3IEBAIHZvaWQgUGF5bWVudENvb3Jk aW5hdG9yOjpkaWRDYW5jZWxQYXltZW50U2Vzc2lvbigpCiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRDYW5jZWxQYXltZW50U2Vzc2lvbigp Iik7CiAgICAgbV9hY3RpdmVTZXNzaW9uLT5kaWRDYW5jZWxQYXltZW50U2Vzc2lvbigpOwogICAg IG1fYWN0aXZlU2Vzc2lvbiA9IG51bGxwdHI7CiB9CkBAIC0yMjksMTQgKzI1MywyMCBAQCBPcHRp b25hbDxTdHJpbmc+IFBheW1lbnRDb29yZGluYXRvcjo6dmFsaWRhdGVkUGF5bWVudE5ldHdvcmso RG9jdW1lbnQmIGRvY3VtZW50LAogCiBib29sIFBheW1lbnRDb29yZGluYXRvcjo6c2hvdWxkQWxs b3dBcHBsZVBheShEb2N1bWVudCYgZG9jdW1lbnQpIGNvbnN0CiB7Ci0gICAgaWYgKG1fY2xpZW50 LnN1cHBvcnRzVW5yZXN0cmljdGVkQXBwbGVQYXkoKSkKKyAgICBpZiAobV9jbGllbnQuc3VwcG9y dHNVbnJlc3RyaWN0ZWRBcHBsZVBheSgpKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9X RUQoInNob3VsZEFsbG93QXBwbGVQYXkoKSAtPiB0cnVlICh1bnJlc3RyaWN0ZWQgY2xpZW50KSIp OwogICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CiAKLSAgICBpZiAoZG9jdW1lbnQuaGFzRXZh bHVhdGVkVXNlckFnZW50U2NyaXB0cygpIHx8IGRvY3VtZW50LmlzUnVubmluZ1VzZXJTY3JpcHRz KCkpIHsKKyAgICBhdXRvIGhhc0V2YWx1YXRlZFVzZXJBZ2VudFNjcmlwdHMgPSBkb2N1bWVudC5o YXNFdmFsdWF0ZWRVc2VyQWdlbnRTY3JpcHRzKCk7CisgICAgYXV0byBpc1J1bm5pbmdVc2VyU2Ny aXB0cyA9IGRvY3VtZW50LmlzUnVubmluZ1VzZXJTY3JpcHRzKCk7CisgICAgaWYgKGhhc0V2YWx1 YXRlZFVzZXJBZ2VudFNjcmlwdHMgfHwgaXNSdW5uaW5nVXNlclNjcmlwdHMpIHsKICAgICAgICAg QVNTRVJUKHNob3VsZEFsbG93VXNlckFnZW50U2NyaXB0cyhkb2N1bWVudCkpOworICAgICAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKCJzaG91bGRBbGxvd0FwcGxlUGF5KCkgLT4gZmFsc2UgKGhh c0V2YWx1YXRlZFVzZXJBZ2VudFNjcmlwdHM6ICVkLCBpc1J1bm5pbmdVc2VyU2NyaXB0czogJWQp IiwgaGFzRXZhbHVhdGVkVXNlckFnZW50U2NyaXB0cywgaXNSdW5uaW5nVXNlclNjcmlwdHMpOwog ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RCgic2hvdWxkQWxsb3dBcHBsZVBheSgpIC0+IHRydWUiKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0K IApAQCAtMjQ3LDYgKzI3Nyw3IEBAIGJvb2wgUGF5bWVudENvb3JkaW5hdG9yOjpzaG91bGRBbGxv d1VzZXJBZ2VudFNjcmlwdHMoRG9jdW1lbnQmIGRvY3VtZW50KSBjb25zdAogCiAgICAgaWYgKGRv Y3VtZW50Lmhhc1N0YXJ0ZWRBcHBsZVBheVNlc3Npb24oKSkgewogICAgICAgICBBU1NFUlQoc2hv dWxkQWxsb3dBcHBsZVBheShkb2N1bWVudCkpOworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9J Rl9BTExPV0VEKCJzaG91bGRBbGxvd1VzZXJBZ2VudFNjcmlwdHMoKSAtPiBmYWxzZSAoYWN0aXZl IHNlc3Npb24pIik7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKQEAgLTI1NSw0ICsy ODYsNyBAQCBib29sIFBheW1lbnRDb29yZGluYXRvcjo6c2hvdWxkQWxsb3dVc2VyQWdlbnRTY3Jp cHRzKERvY3VtZW50JiBkb2N1bWVudCkgY29uc3QKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQog CisjdW5kZWYgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRAorI3VuZGVmIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQKKwogI2VuZGlmIC8vIEVOQUJMRShBUFBMRV9QQVkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRDb29yZGluYXRvckNsaWVudC5o IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9QYXltZW50Q29vcmRpbmF0b3JDbGll bnQuaAppbmRleCBlODEyZGRiZjdhNDQyN2Y1ZjdkYjdjNjMxZmQ2OWMxMjllOGIwNmM3Li5hMmFm NGYxOWY1MGMwZGE5NjAzMjYwODE0NDE4OThhZTZmNTczZWU4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRDb29yZGluYXRvckNsaWVudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvUGF5bWVudENvb3JkaW5hdG9yQ2xpZW50 LmgKQEAgLTY2LDYgKzY2LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc01vY2tQYXlt ZW50Q29vcmRpbmF0b3IoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9v bCBpc1dlYlBheW1lbnRDb29yZGluYXRvcigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKKyAg ICB2aXJ0dWFsIGJvb2wgaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCkgY29uc3QgeyByZXR1cm4g ZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNVbnJlc3RyaWN0ZWRBcHBsZVBheSgp IGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vTG9nZ2luZy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9n Z2luZy5oCmluZGV4IGYwNTZmOTZjODI2ZTI5ZWQ4OTIwMDBmMDhlMjQ0ZDY2N2M5ODAxN2MuLmFi ZjA3OWRlZmEyOGEzNGRjZTgwNjYwN2RmNTZhZjA5NWNmNzEyYWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL0xvZ2dpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9Mb2dnaW5nLmgKQEAgLTM5LDYgKzM5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAjZGVm aW5lIFdFQkNPUkVfTE9HX0NIQU5ORUxTKE0pIFwKICAgICBNKEFuaW1hdGlvbnMpIFwKKyAgICBN KEFwcGxlUGF5KSBcCiAgICAgTShBcmNoaXZlcykgXAogICAgIE0oQ29tcG9zaXRpbmcpIFwKICAg ICBNKENvbnRlbnRGaWx0ZXJpbmcpIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rp bmcvTW9ja1BheW1lbnRDb29yZGluYXRvci5oIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2Nr UGF5bWVudENvb3JkaW5hdG9yLmgKaW5kZXggMTRhMGM5NzQ2OGVkMTlmYzg0MmY5YzcwNTcyYjJj ZDFkYjhmMjgzNC4uYjFmNzMwOWMxYzQwNGRkMGMyMmVhYWZmNDEzOTRlNzQ1MjA2YjVhNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2NrUGF5bWVudENvb3JkaW5hdG9yLmgK KysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2NrUGF5bWVudENvb3JkaW5hdG9yLmgKQEAg LTgzLDYgKzgzLDggQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgaXNNb2NrUGF5bWVudENvb3JkaW5h dG9yKCkgY29uc3QgZmluYWwgeyByZXR1cm4gdHJ1ZTsgfQogCisgICAgYm9vbCBpc0Fsd2F5c09u TG9nZ2luZ0FsbG93ZWQoKSBjb25zdCBmaW5hbCB7IHJldHVybiB0cnVlOyB9CisKICAgICB2b2lk IHVwZGF0ZVRvdGFsQW5kTGluZUl0ZW1zKGNvbnN0IEFwcGxlUGF5U2Vzc2lvblBheW1lbnRSZXF1 ZXN0OjpUb3RhbEFuZExpbmVJdGVtcyYpOwogCiAgICAgUGFnZSYgbV9wYWdlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRv ci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3Jk aW5hdG9yLmNwcAppbmRleCBlYmUzZWM2MjhmM2U2ZTlmYzQ0Njg4NDliMWJjZDFlZjcyNzc3M2Y2 Li5mZjQ0OTM0MWQ5ZTQ0MmZjMTYyZTQxNTQ0YjM4NWIxN2MwNTNhMDM4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9yLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3Jk aW5hdG9yLmNwcApAQCAtMTQyLDYgKzE0MiwxMSBAQCB2b2lkIFdlYlBheW1lbnRDb29yZGluYXRv cjo6cGF5bWVudENvb3JkaW5hdG9yRGVzdHJveWVkKCkKICAgICBkZWxldGUgdGhpczsKIH0KIAor Ym9vbCBXZWJQYXltZW50Q29vcmRpbmF0b3I6OmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpIGNv bnN0Cit7CisgICAgcmV0dXJuIG1fd2ViUGFnZS5pc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKTsK K30KKwogYm9vbCBXZWJQYXltZW50Q29vcmRpbmF0b3I6OnN1cHBvcnRzVW5yZXN0cmljdGVkQXBw bGVQYXkoKSBjb25zdAogewogI2lmIEVOQUJMRShBUFBMRV9QQVlfUkVNT1RFX1VJKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGlu YXRvci5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29y ZGluYXRvci5oCmluZGV4IDc4NjM2NzI2ODI3MWNlNTlhNDRiYjhmNTdlMmJhOTA5YTIzYTI4MzMu LmI2ZDRhMDQyMGQ1YTVkYmQ2NDYwODNhZjY3ODgwNTFiZjZjYzQ3ZTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3IuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5h dG9yLmgKQEAgLTc4LDYgKzc4LDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgaXNXZWJQYXltZW50 Q29vcmRpbmF0b3IoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CiAKKyAgICBib29s IGlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIGJvb2wgc3Vw cG9ydHNVbnJlc3RyaWN0ZWRBcHBsZVBheSgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgLy8gSVBD OjpNZXNzYWdlUmVjZWl2ZXIuCg==