177703 2017-09-29 23:21:36 -0700 [JSC] Introduce import.meta 2017-10-04 22:15:52 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki buildbot fpizlo keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1354868 0 ysuzuki 2017-09-29 23:21:36 -0700 import.meta becomes stage 3. 1354879 1 322287 ysuzuki 2017-09-30 01:22:11 -0700 Created attachment 322287 Patch 1356802 2 ysuzuki 2017-10-04 20:12:09 -0700 Ping? 1356803 3 322287 fpizlo 2017-10-04 20:15:29 -0700 Comment on attachment 322287 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=322287&action=review > Source/JavaScriptCore/parser/Parser.cpp:431 > + // They are `import("...")` call or `import.meta` meta property cases. It’s still “this is”. This is one thing, which we choose from two things. Therefore, singular. 1356820 4 322287 ysuzuki 2017-10-04 20:53:46 -0700 Comment on attachment 322287 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=322287&action=review >> Source/JavaScriptCore/parser/Parser.cpp:431 >> + // They are `import("...")` call or `import.meta` meta property cases. > > It’s still “this is”. This is one thing, which we choose from two things. Therefore, singular. Oh! Thanks, fixed. 1356825 5 ysuzuki 2017-10-04 20:57:49 -0700 Committed r222895: <http://trac.webkit.org/changeset/222895> 1356826 6 webkit-bug-importer 2017-10-04 20:58:15 -0700 <rdar://problem/34827357> 1356844 7 322287 saam 2017-10-04 22:15:52 -0700 Comment on attachment 322287 Patch LGTM too 322287 2017-09-30 01:22:11 -0700 2017-10-04 20:15:29 -0700 Patch bug-177703-20170930172210.patch text/plain 24606 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm YzQ2ODUxOGVmOGZkODIwZDdkNWU0YTE0MjdmMDdjNjFlMWVmZDFiLi44ZmVjZTk2MDY3M2M1NDU2 MmQ3MDI3ZWM1MmVmYmY5MjUzOTdlYzFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOSBAQAorMjAxNy0wOS0zMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBJbnRyb2R1Y2UgaW1wb3J0Lm1ldGEKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NzcwMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBzdGFn ZSAzIGBpbXBvcnQubWV0YWBbMV0uCisgICAgICAgIFdlIGFkZCBhIG5ldyBob29rIGZ1bmN0aW9u IG1vZHVsZUxvYWRlckNyZWF0ZUltcG9ydE1ldGFQcm9wZXJ0aWVzLCB3aGljaCBjcmVhdGVzCisg ICAgICAgIGltcG9ydCBtZXRhIHByb3BlcnRpZXMgb2JqZWN0IHRvIHRoaXMgbW9kdWxlLiBBbmQg d2Ugc2V0IHRoaXMgb2JqZWN0IGFzIEBtZXRhCisgICAgICAgIHByaXZhdGUgdmFyaWFibGUgaW4g bW9kdWxlIGVudmlyb25tZW50cy4gU28gbW9kdWxlIGNvZGUgY2FuIGFjY2VzcyB0aGlzIGJ5IGFj Y2Vzc2luZworICAgICAgICBAbWV0YSBwcml2YXRlIHZhcmlhYmxlLgorCisgICAgICAgIFsxXTog aHR0cHM6Ly9naXRodWIuY29tL3RjMzkvcHJvcG9zYWwtaW1wb3J0LW1ldGEKKworICAgICAgICAq IGJ1aWx0aW5zL0J1aWx0aW5OYW1lcy5oOgorICAgICAgICAqIGJ1aWx0aW5zL01vZHVsZUxvYWRl clByb3RvdHlwZS5qczoKKyAgICAgICAgKiBieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3Iu Y3BwOgorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6Qnl0ZWNvZGVHZW5lcmF0b3Ip OgorICAgICAgICAqIGpzYy5jcHA6CisgICAgICAgIChHbG9iYWxPYmplY3Q6Om1vZHVsZUxvYWRl ckNyZWF0ZUltcG9ydE1ldGFQcm9wZXJ0aWVzKToKKyAgICAgICAgKiBwYXJzZXIvUGFyc2VyLmNw cDoKKyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlTW9kdWxlU291cmNlRWxl bWVudHMpOgorICAgICAgICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VNZW1iZXJFeHBy ZXNzaW9uKToKKyAgICAgICAgKiBydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNwcDoKKyAgICAgICAg KiBydW50aW1lL0pTR2xvYmFsT2JqZWN0Lmg6CisgICAgICAgICogcnVudGltZS9KU01vZHVsZUxv YWRlci5jcHA6CisgICAgICAgIChKU0M6OkpTTW9kdWxlTG9hZGVyOjpjcmVhdGVJbXBvcnRNZXRh UHJvcGVydGllcyk6CisgICAgICAgICogcnVudGltZS9KU01vZHVsZUxvYWRlci5oOgorICAgICAg ICAqIHJ1bnRpbWUvSlNNb2R1bGVSZWNvcmQuY3BwOgorICAgICAgICAoSlNDOjpKU01vZHVsZVJl Y29yZDo6bGluayk6CisgICAgICAgIChKU0M6OkpTTW9kdWxlUmVjb3JkOjppbnN0YW50aWF0ZURl Y2xhcmF0aW9ucyk6CisgICAgICAgICogcnVudGltZS9KU01vZHVsZVJlY29yZC5oOgorICAgICAg ICAqIHJ1bnRpbWUvTW9kdWxlTG9hZGVyUHJvdG90eXBlLmNwcDoKKyAgICAgICAgKEpTQzo6bW9k dWxlTG9hZGVyUHJvdG90eXBlTW9kdWxlRGVjbGFyYXRpb25JbnN0YW50aWF0aW9uKToKKwogMjAx Ny0wOS0yOSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAg ICBbREZHXSBTdXBwb3J0IEFycmF5UHVzaCB3aXRoIG11bHRpcGxlIGFyZ3MKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCAxYmUxODM0M2M3NjkzNDQzYWQ5ZWZiODRlODk1Zjk2ZTUwM2QxZjEyLi4zNDk5ZWMwZTk0YjU0 NjdlY2Y3NzYyYTlhOGQ5NTIyMjJmNmI4OTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTctMDktMzAgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CisKKyAg ICAgICAgW0pTQ10gSW50cm9kdWNlIGltcG9ydC5tZXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc3MDMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NV2luZG93QmFzZS5j cHA6CisgICAgICAgICogYmluZGluZ3MvanMvSlNXb3JrZXJHbG9iYWxTY29wZUJhc2UuY3BwOgor CiAyMDE3LTA5LTI5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmVtb3ZlIHJlZHVuZGFudCBSZW5kZXJPYmplY3Q6OnNlbGVjdGlvblJvb3QgYW5kIGRlcGVuZGVu Y2llcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J1aWx0aW5zL0J1aWx0aW5O YW1lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J1aWx0aW5zL0J1aWx0aW5OYW1lcy5oCmlu ZGV4IGExODUxM2JhNTU2ZmI5YzkyYjFhMmM1MTQxZWUzNjY0MzJlYmNhYmQuLjFjZTU0NTRkOTJl YTA2NTE2MzBjY2U5OTRkOWZkMzU1ZmNlMmZmYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9idWlsdGlucy9CdWlsdGluTmFtZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnVpbHRpbnMvQnVpbHRpbk5hbWVzLmgKQEAgLTE5NCw2ICsxOTQsNyBAQCBuYW1lc3BhY2Ug SlNDIHsKICAgICBtYWNybyhDb21waWxlRXJyb3IpIFwKICAgICBtYWNybyhMaW5rRXJyb3IpIFwK ICAgICBtYWNybyhSdW50aW1lRXJyb3IpIFwKKyAgICBtYWNybyhtZXRhKSBcCiAKIG5hbWVzcGFj ZSBTeW1ib2xzIHsKICNkZWZpbmUgREVDTEFSRV9CVUlMVElOX1NUQVRJQ19TWU1CT0xTKG5hbWUp IGV4dGVybiBTeW1ib2xJbXBsOjpTdGF0aWNTeW1ib2xJbXBsIG5hbWUjI1N5bWJvbDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9idWlsdGlucy9Nb2R1bGVMb2FkZXJQcm90b3R5 cGUuanMgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnVpbHRpbnMvTW9kdWxlTG9hZGVyUHJvdG90 eXBlLmpzCmluZGV4IDI5NTU2ZWEzZDg0MGUyNmMwNWQ0MTU5NGU0MjJlM2FiMzE2ZmU2YTAuLjUz NWEyNDAwYzYxOTQ2YmFhYmE2YjU0MmVjOWE5ZWIxMjVjYjFhM2YgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9idWlsdGlucy9Nb2R1bGVMb2FkZXJQcm90b3R5cGUuanMKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2J1aWx0aW5zL01vZHVsZUxvYWRlclByb3RvdHlwZS5qcwpA QCAtMzY2LDcgKzM2Niw3IEBAIGZ1bmN0aW9uIGxpbmsoZW50cnksIGZldGNoZXIpCiAgICAgICAg ICAgICB0aGlzLmxpbmsocGFpci52YWx1ZS5yZWdpc3RyeUVudHJ5LCBmZXRjaGVyKTsKICAgICAg ICAgfQogCi0gICAgICAgIHRoaXMubW9kdWxlRGVjbGFyYXRpb25JbnN0YW50aWF0aW9uKGVudHJ5 Lm1vZHVsZSwgZmV0Y2hlcik7CisgICAgICAgIHRoaXMubW9kdWxlRGVjbGFyYXRpb25JbnN0YW50 aWF0aW9uKGVudHJ5Lm1vZHVsZSwgZW50cnkua2V5LCBmZXRjaGVyKTsKICAgICB9IGNhdGNoIChl cnJvcikgewogICAgICAgICBlbnRyeS5saW5rU3VjY2VlZGVkID0gZmFsc2U7CiAgICAgICAgIGVu dHJ5LmxpbmtFcnJvciA9IGVycm9yOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcAppbmRleCA3ZjY4N2M2OGI2Yzgw MzcyOWVjOGRlNzhmNjA2OGJiZTdhOWUzN2MyLi41Y2JiZjRhOGM5MWRkMDQwMmQzNTFjMWQzMmI1 OTcwNTcxOGYzMGM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBp bGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcApAQCAtODg5LDYgKzg4OSw4IEBAIEJ5dGVj b2RlR2VuZXJhdG9yOjpCeXRlY29kZUdlbmVyYXRvcihWTSYgdm0sIE1vZHVsZVByb2dyYW1Ob2Rl KiBtb2R1bGVQcm9ncmFtTm9kCiAKICAgICAvLyBOb3cgZGVjbGFyZSBhbGwgdmFyaWFibGVzLgog CisgICAgY3JlYXRlVmFyaWFibGUobV92bS0+cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCku bWV0YVByaXZhdGVOYW1lKCksIFZhcktpbmQ6OlNjb3BlLCBtb2R1bGVFbnZpcm9ubWVudFN5bWJv bFRhYmxlLCBWZXJpZnlFeGlzdGluZyk7CisKICAgICBmb3IgKGF1dG8mIGVudHJ5IDogbW9kdWxl UHJvZ3JhbU5vZGUtPnZhckRlY2xhcmF0aW9ucygpKSB7CiAgICAgICAgIEFTU0VSVCghZW50cnku dmFsdWUuaXNMZXQoKSAmJiAhZW50cnkudmFsdWUuaXNDb25zdCgpKTsKICAgICAgICAgaWYgKCFl bnRyeS52YWx1ZS5pc1ZhcigpKSAvLyBUaGlzIGlzIGVpdGhlciBhIHBhcmFtZXRlciBvciBjYWxs ZWUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9qc2MuY3BwCmluZGV4IDE4MTE4MmU3ZDIyY2ZiZmQ4Mzc3MThhNjIzMmI4 ZGIwYjk1NjAxZjguLjdmYzFkNWQ3OGI5YmZkZDI0YWE0NmJjNmQ0ZTM3OTFlNjhlNDk4YjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qc2MuY3BwCkBAIC0xNTcxLDYgKzE1NzEsNyBAQCBjbGFzcyBHbG9iYWxPYmpl Y3QgOiBwdWJsaWMgSlNHbG9iYWxPYmplY3QgewogICAgIHN0YXRpYyBKU0ludGVybmFsUHJvbWlz ZSogbW9kdWxlTG9hZGVySW1wb3J0TW9kdWxlKEpTR2xvYmFsT2JqZWN0KiwgRXhlY1N0YXRlKiwg SlNNb2R1bGVMb2FkZXIqLCBKU1N0cmluZyosIGNvbnN0IFNvdXJjZU9yaWdpbiYpOwogICAgIHN0 YXRpYyBKU0ludGVybmFsUHJvbWlzZSogbW9kdWxlTG9hZGVyUmVzb2x2ZShKU0dsb2JhbE9iamVj dCosIEV4ZWNTdGF0ZSosIEpTTW9kdWxlTG9hZGVyKiwgSlNWYWx1ZSwgSlNWYWx1ZSwgSlNWYWx1 ZSk7CiAgICAgc3RhdGljIEpTSW50ZXJuYWxQcm9taXNlKiBtb2R1bGVMb2FkZXJGZXRjaChKU0ds b2JhbE9iamVjdCosIEV4ZWNTdGF0ZSosIEpTTW9kdWxlTG9hZGVyKiwgSlNWYWx1ZSwgSlNWYWx1 ZSk7CisgICAgc3RhdGljIEpTT2JqZWN0KiBtb2R1bGVMb2FkZXJDcmVhdGVJbXBvcnRNZXRhUHJv cGVydGllcyhKU0dsb2JhbE9iamVjdCosIEV4ZWNTdGF0ZSosIEpTTW9kdWxlTG9hZGVyKiwgSlNW YWx1ZSwgSlNNb2R1bGVSZWNvcmQqLCBKU1ZhbHVlKTsKIH07CiAKIGNvbnN0IENsYXNzSW5mbyBH bG9iYWxPYmplY3Q6OnNfaW5mbyA9IHsgImdsb2JhbCIsICZKU0dsb2JhbE9iamVjdDo6c19pbmZv LCBudWxscHRyLCBudWxscHRyLCBDUkVBVEVfTUVUSE9EX1RBQkxFKEdsb2JhbE9iamVjdCkgfTsK QEAgLTE1ODQsNiArMTU4NSw3IEBAIGNvbnN0IEdsb2JhbE9iamVjdE1ldGhvZFRhYmxlIEdsb2Jh bE9iamVjdDo6c19nbG9iYWxPYmplY3RNZXRob2RUYWJsZSA9IHsKICAgICAmbW9kdWxlTG9hZGVy UmVzb2x2ZSwKICAgICAmbW9kdWxlTG9hZGVyRmV0Y2gsCiAgICAgbnVsbHB0ciwgLy8gbW9kdWxl TG9hZGVySW5zdGFudGlhdGUKKyAgICAmbW9kdWxlTG9hZGVyQ3JlYXRlSW1wb3J0TWV0YVByb3Bl cnRpZXMsCiAgICAgbnVsbHB0ciwgLy8gbW9kdWxlTG9hZGVyRXZhbHVhdGUKICAgICBudWxscHRy LCAvLyBwcm9taXNlUmVqZWN0aW9uVHJhY2tlcgogICAgIG51bGxwdHIsIC8vIGRlZmF1bHRMYW5n dWFnZQpAQCAtMTkxNyw2ICsxOTE5LDE5IEBAIEpTSW50ZXJuYWxQcm9taXNlKiBHbG9iYWxPYmpl Y3Q6Om1vZHVsZUxvYWRlckZldGNoKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsCiAgICAg cmV0dXJuIHJlc3VsdDsKIH0KIAorSlNPYmplY3QqIEdsb2JhbE9iamVjdDo6bW9kdWxlTG9hZGVy Q3JlYXRlSW1wb3J0TWV0YVByb3BlcnRpZXMoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwg RXhlY1N0YXRlKiBleGVjLCBKU01vZHVsZUxvYWRlciosIEpTVmFsdWUga2V5LCBKU01vZHVsZVJl Y29yZCosIEpTVmFsdWUpCit7CisgICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKKyAgICBhdXRvIHNj b3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CisKKyAgICBKU09iamVjdCogbWV0YVByb3Bl cnRpZXMgPSBjb25zdHJ1Y3RFbXB0eU9iamVjdChleGVjLCBnbG9iYWxPYmplY3QtPm51bGxQcm90 b3R5cGVPYmplY3RTdHJ1Y3R1cmUoKSk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg bnVsbHB0cik7CisKKyAgICBtZXRhUHJvcGVydGllcy0+cHV0RGlyZWN0KHZtLCBJZGVudGlmaWVy Ojpmcm9tU3RyaW5nKCZ2bSwgImZpbGVuYW1lIiksIGtleSk7CisgICAgUkVUVVJOX0lGX0VYQ0VQ VElPTihzY29wZSwgbnVsbHB0cik7CisKKyAgICByZXR1cm4gbWV0YVByb3BlcnRpZXM7Cit9CiAK IHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBwcmludEludGVybmFsKEV4ZWNTdGF0ZSogZXhlYywgRklM RSogb3V0KQogewpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJz ZXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCmluZGV4IDhi YzIwZDIyMDM3YTAwZGJkNzcyNTk4NzM4Njk1YzQ0ZjQ4Zjg1MjQuLjYyZGNkYzlhNDQ2OTM5ODZk MzhmNTRhMWE3MGU1ZWI4NDE0OWMyY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9wYXJzZXIvUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1Bh cnNlci5jcHAKQEAgLTQxOSw3ICs0MTksNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+ IFRyZWVTb3VyY2VFbGVtZW50cyBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VNb2R1bGVTbwogICAg ICAgICBjYXNlIElNUE9SVDogewogICAgICAgICAgICAgU2F2ZVBvaW50IHNhdmVQb2ludCA9IGNy ZWF0ZVNhdmVQb2ludCgpOwogICAgICAgICAgICAgbmV4dCgpOwotICAgICAgICAgICAgYm9vbCBp c0ltcG9ydERlY2xhcmF0aW9uID0gIW1hdGNoKE9QRU5QQVJFTik7CisgICAgICAgICAgICBib29s IGlzSW1wb3J0RGVjbGFyYXRpb24gPSAhbWF0Y2goT1BFTlBBUkVOKSAmJiAhbWF0Y2goRE9UKTsK ICAgICAgICAgICAgIHJlc3RvcmVTYXZlUG9pbnQoc2F2ZVBvaW50KTsKICAgICAgICAgICAgIGlm IChpc0ltcG9ydERlY2xhcmF0aW9uKSB7CiAgICAgICAgICAgICAgICAgc3RhdGVtZW50ID0gcGFy c2VJbXBvcnREZWNsYXJhdGlvbihjb250ZXh0KTsKQEAgLTQyOCw3ICs0MjgsNyBAQCB0ZW1wbGF0 ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTb3VyY2VFbGVtZW50cyBQYXJzZXI8TGV4ZXJUeXBl Pjo6cGFyc2VNb2R1bGVTbwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQog Ci0gICAgICAgICAgICAvLyBUaGlzIGlzIGBpbXBvcnQoIi4uLiIpYCBjYWxsIGNhc2UuCisgICAg ICAgICAgICAvLyBUaGV5IGFyZSBgaW1wb3J0KCIuLi4iKWAgY2FsbCBvciBgaW1wb3J0Lm1ldGFg IG1ldGEgcHJvcGVydHkgY2FzZXMuCiAgICAgICAgICAgICBGQUxMVEhST1VHSDsKICAgICAgICAg fQogCkBAIC00Njg3LDExICs0Njg3LDI1IEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4g VHJlZUV4cHJlc3Npb24gUGFyc2VyPExleGVyVHlwZT46OnBhcnNlTWVtYmVyRXhwcmVzCiAgICAg fSBlbHNlIGlmIChiYXNlSXNJbXBvcnQpIHsKICAgICAgICAgbmV4dCgpOwogICAgICAgICBKU1Rl eHRQb3NpdGlvbiBleHByZXNzaW9uRW5kID0gbGFzdFRva2VuRW5kUG9zaXRpb24oKTsKLSAgICAg ICAgY29uc3VtZU9yRmFpbChPUEVOUEFSRU4sICJpbXBvcnQgY2FsbCBleHBlY3RzIGV4YWN0bHkg b25lIGFyZ3VtZW50Iik7Ci0gICAgICAgIFRyZWVFeHByZXNzaW9uIGV4cHIgPSBwYXJzZUFzc2ln bm1lbnRFeHByZXNzaW9uKGNvbnRleHQpOwotICAgICAgICBmYWlsSWZGYWxzZShleHByLCAiQ2Fu bm90IHBhcnNlIGV4cHJlc3Npb24iKTsKLSAgICAgICAgY29uc3VtZU9yRmFpbChDTE9TRVBBUkVO LCAiaW1wb3J0IGNhbGwgZXhwZWN0cyBleGFjdGx5IG9uZSBhcmd1bWVudCIpOwotICAgICAgICBi YXNlID0gY29udGV4dC5jcmVhdGVJbXBvcnRFeHByKGxvY2F0aW9uLCBleHByLCBleHByZXNzaW9u U3RhcnQsIGV4cHJlc3Npb25FbmQsIGxhc3RUb2tlbkVuZFBvc2l0aW9uKCkpOworICAgICAgICBp ZiAoY29uc3VtZShET1QpKSB7CisgICAgICAgICAgICBpZiAoIW1hdGNoKElERU5UKSkKKyAgICAg ICAgICAgICAgICBmYWlsRHVlVG9VbmV4cGVjdGVkVG9rZW4oKTsKKyAgICAgICAgICAgIGNvbnN0 IElkZW50aWZpZXIqIGlkZW50ID0gbV90b2tlbi5tX2RhdGEuaWRlbnQ7CisgICAgICAgICAgICBp ZiAobV92bS0+cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkubWV0YVB1YmxpY05hbWUoKSAh PSAqaWRlbnQpCisgICAgICAgICAgICAgICAgZmFpbFdpdGhNZXNzYWdlKCJcImltcG9ydC5cIiBj YW4gb25seSBmb2xsb3dlZCB3aXRoIG1ldGEiKTsKKworICAgICAgICAgICAgc2VtYW50aWNGYWls SWZGYWxzZShtX3NjcmlwdE1vZGUgPT0gSlNQYXJzZXJTY3JpcHRNb2RlOjpNb2R1bGUsICJpbXBv cnQubWV0YSBpcyBvbmx5IHZhbGlkIGluc2lkZSBtb2R1bGVzIik7CisKKyAgICAgICAgICAgIEpT VG9rZW5Mb2NhdGlvbiBsb2NhdGlvbih0b2tlbkxvY2F0aW9uKCkpOworICAgICAgICAgICAgYmFz ZSA9IGNyZWF0ZVJlc29sdmVBbmRVc2VWYXJpYWJsZShjb250ZXh0LCAmbV92bS0+cHJvcGVydHlO YW1lcy0+YnVpbHRpbk5hbWVzKCkubWV0YVByaXZhdGVOYW1lKCksIGZhbHNlLCBleHByZXNzaW9u U3RhcnQsIGxvY2F0aW9uKTsKKyAgICAgICAgICAgIG5leHQoKTsKKyAgICAgICAgfSBlbHNlIHsK KyAgICAgICAgICAgIGNvbnN1bWVPckZhaWwoT1BFTlBBUkVOLCAiaW1wb3J0IGNhbGwgZXhwZWN0 cyBleGFjdGx5IG9uZSBhcmd1bWVudCIpOworICAgICAgICAgICAgVHJlZUV4cHJlc3Npb24gZXhw ciA9IHBhcnNlQXNzaWdubWVudEV4cHJlc3Npb24oY29udGV4dCk7CisgICAgICAgICAgICBmYWls SWZGYWxzZShleHByLCAiQ2Fubm90IHBhcnNlIGV4cHJlc3Npb24iKTsKKyAgICAgICAgICAgIGNv bnN1bWVPckZhaWwoQ0xPU0VQQVJFTiwgImltcG9ydCBjYWxsIGV4cGVjdHMgZXhhY3RseSBvbmUg YXJndW1lbnQiKTsKKyAgICAgICAgICAgIGJhc2UgPSBjb250ZXh0LmNyZWF0ZUltcG9ydEV4cHIo bG9jYXRpb24sIGV4cHIsIGV4cHJlc3Npb25TdGFydCwgZXhwcmVzc2lvbkVuZCwgbGFzdFRva2Vu RW5kUG9zaXRpb24oKSk7CisgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKCFiYXNlSXNOZXdUYXJn ZXQpIHsKICAgICAgICAgY29uc3QgYm9vbCBpc0FzeW5jID0gbWF0Y2goQVNZTkMpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAKaW5kZXgg MGIzMmQ3NDljYmViM2E4Y2I4MmMwYWQ2YzE0Y2FkYmQ5OWFjMjcxNi4uNDBlNGY0MWU4MjNjNjMw YjVhN2NlNWM2NTkxNzU3MDUxZmYxMGYzMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNwcApAQCAtMjU1LDYgKzI1NSw3IEBAIGNvbnN0IEds b2JhbE9iamVjdE1ldGhvZFRhYmxlIEpTR2xvYmFsT2JqZWN0OjpzX2dsb2JhbE9iamVjdE1ldGhv ZFRhYmxlID0gewogICAgIG51bGxwdHIsIC8vIG1vZHVsZUxvYWRlclJlc29sdmUKICAgICBudWxs cHRyLCAvLyBtb2R1bGVMb2FkZXJGZXRjaAogICAgIG51bGxwdHIsIC8vIG1vZHVsZUxvYWRlcklu c3RhbnRpYXRlCisgICAgbnVsbHB0ciwgLy8gbW9kdWxlTG9hZGVyQ3JlYXRlSW1wb3J0TWV0YVBy b3BlcnRpZXMKICAgICBudWxscHRyLCAvLyBtb2R1bGVMb2FkZXJFdmFsdWF0ZQogICAgIG51bGxw dHIsIC8vIHByb21pc2VSZWplY3Rpb25UcmFja2VyCiAgICAgbnVsbHB0ciwgLy8gZGVmYXVsdExh bmd1YWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2Jh bE9iamVjdC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3Qu aAppbmRleCBkNThkZDhiOTQ2Y2U5NmE3NDQ0MGZhNjA4YTI2MmUxZWU1MzJhMGUwLi44NmEwMTY0 ZTMyMTBkMTA4YThjMDhmMTRhOTYzNzg1NzYzZDEyMTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5oCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmgKQEAgLTgyLDYgKzgyLDcgQEAgY2xhc3Mg SlNBcnJheUJ1ZmZlclByb3RvdHlwZTsKIGNsYXNzIEpTR2xvYmFsT2JqZWN0RGVidWdnYWJsZTsK IGNsYXNzIEpTSW50ZXJuYWxQcm9taXNlOwogY2xhc3MgSlNNb2R1bGVMb2FkZXI7CitjbGFzcyBK U01vZHVsZVJlY29yZDsKIGNsYXNzIEpTUHJvbWlzZTsKIGNsYXNzIEpTUHJvbWlzZUNvbnN0cnVj dG9yOwogY2xhc3MgSlNQcm9taXNlUHJvdG90eXBlOwpAQCAtMTk3LDYgKzE5OCw5IEBAIHN0cnVj dCBHbG9iYWxPYmplY3RNZXRob2RUYWJsZSB7CiAgICAgdHlwZWRlZiBKU0ludGVybmFsUHJvbWlz ZSogKCpNb2R1bGVMb2FkZXJJbnN0YW50aWF0ZVB0cikoSlNHbG9iYWxPYmplY3QqLCBFeGVjU3Rh dGUqLCBKU01vZHVsZUxvYWRlciosIEpTVmFsdWUsIEpTVmFsdWUsIEpTVmFsdWUpOwogICAgIE1v ZHVsZUxvYWRlckluc3RhbnRpYXRlUHRyIG1vZHVsZUxvYWRlckluc3RhbnRpYXRlOwogCisgICAg dHlwZWRlZiBKU09iamVjdCogKCpNb2R1bGVMb2FkZXJDcmVhdGVJbXBvcnRNZXRhUHJvcGVydGll c1B0cikoSlNHbG9iYWxPYmplY3QqLCBFeGVjU3RhdGUqLCBKU01vZHVsZUxvYWRlciosIEpTVmFs dWUsIEpTTW9kdWxlUmVjb3JkKiwgSlNWYWx1ZSk7CisgICAgTW9kdWxlTG9hZGVyQ3JlYXRlSW1w b3J0TWV0YVByb3BlcnRpZXNQdHIgbW9kdWxlTG9hZGVyQ3JlYXRlSW1wb3J0TWV0YVByb3BlcnRp ZXM7CisKICAgICB0eXBlZGVmIEpTVmFsdWUgKCpNb2R1bGVMb2FkZXJFdmFsdWF0ZVB0cikoSlNH bG9iYWxPYmplY3QqLCBFeGVjU3RhdGUqLCBKU01vZHVsZUxvYWRlciosIEpTVmFsdWUsIEpTVmFs dWUsIEpTVmFsdWUpOwogICAgIE1vZHVsZUxvYWRlckV2YWx1YXRlUHRyIG1vZHVsZUxvYWRlckV2 YWx1YXRlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU01v ZHVsZUxvYWRlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU01vZHVsZUxv YWRlci5jcHAKaW5kZXggNTZhNGMyZjQ0MTQxYWE2ZjQ2YjU0ODU2ZTkxMjc4OTFlMjBjNmU1YS4u M2Q3NTJhNmU4ZDBiZGE2MTBkNTFlODA5NTk5ZjBhYmUwNTkwYWY3MCAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTW9kdWxlTG9hZGVyLmNwcApAQCAtNDMsNiArNDMs NyBAQAogI2luY2x1ZGUgIk1vZHVsZUFuYWx5emVyLmgiCiAjaW5jbHVkZSAiTW9kdWxlTG9hZGVy UHJvdG90eXBlLmgiCiAjaW5jbHVkZSAiTm9kZXMuaCIKKyNpbmNsdWRlICJPYmplY3RDb25zdHJ1 Y3Rvci5oIgogI2luY2x1ZGUgIlBhcnNlci5oIgogI2luY2x1ZGUgIlBhcnNlckVycm9yLmgiCiAK QEAgLTI0OSw2ICsyNTAsMTQgQEAgSlNJbnRlcm5hbFByb21pc2UqIEpTTW9kdWxlTG9hZGVyOjpp bnN0YW50aWF0ZShFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUga2V5LCBKU1YKICAgICByZXR1cm4g ZGVmZXJyZWQtPnByb21pc2UoKTsKIH0KIAorSlNPYmplY3QqIEpTTW9kdWxlTG9hZGVyOjpjcmVh dGVJbXBvcnRNZXRhUHJvcGVydGllcyhFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUga2V5LCBKU01v ZHVsZVJlY29yZCogbW9kdWxlUmVjb3JkLCBKU1ZhbHVlIHNjcmlwdEZldGNoZXIpCit7CisgICAg SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCA9IGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3Qo KTsKKyAgICBpZiAoZ2xvYmFsT2JqZWN0LT5nbG9iYWxPYmplY3RNZXRob2RUYWJsZSgpLT5tb2R1 bGVMb2FkZXJDcmVhdGVJbXBvcnRNZXRhUHJvcGVydGllcykKKyAgICAgICAgcmV0dXJuIGdsb2Jh bE9iamVjdC0+Z2xvYmFsT2JqZWN0TWV0aG9kVGFibGUoKS0+bW9kdWxlTG9hZGVyQ3JlYXRlSW1w b3J0TWV0YVByb3BlcnRpZXMoZ2xvYmFsT2JqZWN0LCBleGVjLCB0aGlzLCBrZXksIG1vZHVsZVJl Y29yZCwgc2NyaXB0RmV0Y2hlcik7CisgICAgcmV0dXJuIGNvbnN0cnVjdEVtcHR5T2JqZWN0KGV4 ZWMsIGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKS0+bnVsbFByb3RvdHlwZU9iamVjdFN0cnVj dHVyZSgpKTsKK30KKwogSlNWYWx1ZSBKU01vZHVsZUxvYWRlcjo6ZXZhbHVhdGUoRXhlY1N0YXRl KiBleGVjLCBKU1ZhbHVlIGtleSwgSlNWYWx1ZSBtb2R1bGVSZWNvcmRWYWx1ZSwgSlNWYWx1ZSBz Y3JpcHRGZXRjaGVyKQogewogICAgIGlmIChPcHRpb25zOjpkdW1wTW9kdWxlTG9hZGluZ1N0YXRl KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU01vZHVsZUxv YWRlci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVMb2FkZXIuaApp bmRleCBjM2UwMjNlZTVhYjBmMTBkMjNhYjg2ZjQ3NDEwZjlmOTM4MTljMjYyLi5mZjYxNmY5Y2Jm MDU1YzkwNzUwZGVmZjNiNWMzMzhjNTJkODYzNGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU01vZHVsZUxvYWRlci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTTW9kdWxlTG9hZGVyLmgKQEAgLTc0LDYgKzc0LDcgQEAgY2xhc3MgSlNN b2R1bGVMb2FkZXIgOiBwdWJsaWMgSlNOb25GaW5hbE9iamVjdCB7CiAgICAgSlNJbnRlcm5hbFBy b21pc2UqIHJlc29sdmUoRXhlY1N0YXRlKiwgSlNWYWx1ZSBuYW1lLCBKU1ZhbHVlIHJlZmVycmVy LCBKU1ZhbHVlIHNjcmlwdEZldGNoZXIpOwogICAgIEpTSW50ZXJuYWxQcm9taXNlKiBmZXRjaChF eGVjU3RhdGUqLCBKU1ZhbHVlIGtleSwgSlNWYWx1ZSBzY3JpcHRGZXRjaGVyKTsKICAgICBKU0lu dGVybmFsUHJvbWlzZSogaW5zdGFudGlhdGUoRXhlY1N0YXRlKiwgSlNWYWx1ZSBrZXksIEpTVmFs dWUgc291cmNlLCBKU1ZhbHVlIHNjcmlwdEZldGNoZXIpOworICAgIEpTT2JqZWN0KiBjcmVhdGVJ bXBvcnRNZXRhUHJvcGVydGllcyhFeGVjU3RhdGUqLCBKU1ZhbHVlIGtleSwgSlNNb2R1bGVSZWNv cmQqLCBKU1ZhbHVlIHNjcmlwdEZldGNoZXIpOwogCiAgICAgLy8gQWRkaXRpb25hbCBwbGF0Zm9y bSBkZXBlbmRlbnQgaG9va2VkIEFQSXMuCiAgICAgSlNWYWx1ZSBldmFsdWF0ZShFeGVjU3RhdGUq LCBKU1ZhbHVlIGtleSwgSlNWYWx1ZSBtb2R1bGVSZWNvcmQsIEpTVmFsdWUgc2NyaXB0RmV0Y2hl cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU01vZHVsZVJl Y29yZC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU01vZHVsZVJlY29yZC5j cHAKaW5kZXggZTEzZjdhOGJhMjkyZjc1ZThjNmQ0MmE3ODkyODBiZDdmMzBiNzQ2OS4uYzFjMDM4 NmQ1NjUwYTIzMjEzYjYwOTNlOGEwYjZhNDNhMzRkOWU0NCAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVSZWNvcmQuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTTW9kdWxlUmVjb3JkLmNwcApAQCAtNzYsNyArNzYsNyBAQCB2 b2lkIEpTTW9kdWxlUmVjb3JkOjp2aXNpdENoaWxkcmVuKEpTQ2VsbCogY2VsbCwgU2xvdFZpc2l0 b3ImIHZpc2l0b3IpCiAgICAgdmlzaXRvci5hcHBlbmQodGhpc09iamVjdC0+bV9tb2R1bGVQcm9n cmFtRXhlY3V0YWJsZSk7CiB9CiAKLXZvaWQgSlNNb2R1bGVSZWNvcmQ6OmxpbmsoRXhlY1N0YXRl KiBleGVjKQordm9pZCBKU01vZHVsZVJlY29yZDo6bGluayhFeGVjU3RhdGUqIGV4ZWMsIEpTVmFs dWUga2V5LCBKU1ZhbHVlIHNjcmlwdEZldGNoZXIpCiB7CiAgICAgVk0mIHZtID0gZXhlYy0+dm0o KTsKICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CkBAIC04NywxMiAr ODcsMTIgQEAgdm9pZCBKU01vZHVsZVJlY29yZDo6bGluayhFeGVjU3RhdGUqIGV4ZWMpCiAgICAg ICAgIHRocm93U3ludGF4RXJyb3IoZXhlYywgc2NvcGUpOwogICAgICAgICByZXR1cm47CiAgICAg fQotICAgIGluc3RhbnRpYXRlRGVjbGFyYXRpb25zKGV4ZWMsIGV4ZWN1dGFibGUpOworICAgIGlu c3RhbnRpYXRlRGVjbGFyYXRpb25zKGV4ZWMsIGV4ZWN1dGFibGUsIGtleSwgc2NyaXB0RmV0Y2hl cik7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9pZCgpKTsKICAgICBtX21vZHVs ZVByb2dyYW1FeGVjdXRhYmxlLnNldCh2bSwgdGhpcywgZXhlY3V0YWJsZSk7CiB9CiAKLXZvaWQg SlNNb2R1bGVSZWNvcmQ6Omluc3RhbnRpYXRlRGVjbGFyYXRpb25zKEV4ZWNTdGF0ZSogZXhlYywg TW9kdWxlUHJvZ3JhbUV4ZWN1dGFibGUqIG1vZHVsZVByb2dyYW1FeGVjdXRhYmxlKQordm9pZCBK U01vZHVsZVJlY29yZDo6aW5zdGFudGlhdGVEZWNsYXJhdGlvbnMoRXhlY1N0YXRlKiBleGVjLCBN b2R1bGVQcm9ncmFtRXhlY3V0YWJsZSogbW9kdWxlUHJvZ3JhbUV4ZWN1dGFibGUsIEpTVmFsdWUg a2V5LCBKU1ZhbHVlIHNjcmlwdEZldGNoZXIpCiB7CiAgICAgVk0mIHZtID0gZXhlYy0+dm0oKTsK ICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CkBAIC0yMDUsNiArMjA1 LDE0IEBAIHZvaWQgSlNNb2R1bGVSZWNvcmQ6Omluc3RhbnRpYXRlRGVjbGFyYXRpb25zKEV4ZWNT dGF0ZSogZXhlYywgTW9kdWxlUHJvZ3JhbUV4ZWN1CiAgICAgICAgIH0KICAgICB9CiAKKyAgICB7 CisgICAgICAgIEpTT2JqZWN0KiBtZXRhUHJvcGVydGllcyA9IGV4ZWMtPmxleGljYWxHbG9iYWxP YmplY3QoKS0+bW9kdWxlTG9hZGVyKCktPmNyZWF0ZUltcG9ydE1ldGFQcm9wZXJ0aWVzKGV4ZWMs IGtleSwgdGhpcywgc2NyaXB0RmV0Y2hlcik7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04o c2NvcGUsIHZvaWQoKSk7CisgICAgICAgIGJvb2wgcHV0UmVzdWx0ID0gZmFsc2U7CisgICAgICAg IHN5bWJvbFRhYmxlUHV0VG91Y2hXYXRjaHBvaW50U2V0KG1vZHVsZUVudmlyb25tZW50LCBleGVj LCB2bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMoKS5tZXRhUHJpdmF0ZU5hbWUoKSwgbWV0 YVByb3BlcnRpZXMsIC8qIHNob3VsZFRocm93UmVhZE9ubHlFcnJvciAqLyBmYWxzZSwgLyogaWdu b3JlUmVhZE9ubHlFcnJvcnMgKi8gdHJ1ZSwgcHV0UmVzdWx0KTsKKyAgICAgICAgUkVUVVJOX0lG X0VYQ0VQVElPTihzY29wZSwgdm9pZCgpKTsKKyAgICB9CisKICAgICBtX21vZHVsZUVudmlyb25t ZW50LnNldCh2bSwgdGhpcywgbW9kdWxlRW52aXJvbm1lbnQpOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU01vZHVsZVJlY29yZC5oIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVSZWNvcmQuaAppbmRleCAwZjVjMmI4ODVhMzFk NGYwNDlmNjA2ZjM0NjVmNThiNjA0NTVlZDk3Li4xZmNhNjgzYTQzODA4ODJlNGQzZTU5MzNkNWUz Nzk2NjlmNTQ3ZjhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U01vZHVsZVJlY29yZC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTW9k dWxlUmVjb3JkLmgKQEAgLTQ1LDcgKzQ1LDcgQEAgY2xhc3MgSlNNb2R1bGVSZWNvcmQgOiBwdWJs aWMgQWJzdHJhY3RNb2R1bGVSZWNvcmQgewogICAgIHN0YXRpYyBTdHJ1Y3R1cmUqIGNyZWF0ZVN0 cnVjdHVyZShWTSYsIEpTR2xvYmFsT2JqZWN0KiwgSlNWYWx1ZSk7CiAgICAgc3RhdGljIEpTTW9k dWxlUmVjb3JkKiBjcmVhdGUoRXhlY1N0YXRlKiwgVk0mLCBTdHJ1Y3R1cmUqLCBjb25zdCBJZGVu dGlmaWVyJiwgY29uc3QgU291cmNlQ29kZSYsIGNvbnN0IFZhcmlhYmxlRW52aXJvbm1lbnQmLCBj b25zdCBWYXJpYWJsZUVudmlyb25tZW50Jik7CiAKLSAgICB2b2lkIGxpbmsoRXhlY1N0YXRlKik7 CisgICAgdm9pZCBsaW5rKEV4ZWNTdGF0ZSosIEpTVmFsdWUga2V5LCBKU1ZhbHVlIHNjcmlwdEZl dGNoZXIpOwogICAgIEpTX0VYUE9SVF9QUklWQVRFIEpTVmFsdWUgZXZhbHVhdGUoRXhlY1N0YXRl Kik7CiAKICAgICBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2VDb2RlKCkgY29uc3QgeyByZXR1cm4g bV9zb3VyY2VDb2RlOyB9CkBAIC02MCw3ICs2MCw3IEBAIGNsYXNzIEpTTW9kdWxlUmVjb3JkIDog cHVibGljIEFic3RyYWN0TW9kdWxlUmVjb3JkIHsKICAgICBzdGF0aWMgdm9pZCB2aXNpdENoaWxk cmVuKEpTQ2VsbCosIFNsb3RWaXNpdG9yJik7CiAgICAgc3RhdGljIHZvaWQgZGVzdHJveShKU0Nl bGwqKTsKIAotICAgIHZvaWQgaW5zdGFudGlhdGVEZWNsYXJhdGlvbnMoRXhlY1N0YXRlKiwgTW9k dWxlUHJvZ3JhbUV4ZWN1dGFibGUqKTsKKyAgICB2b2lkIGluc3RhbnRpYXRlRGVjbGFyYXRpb25z KEV4ZWNTdGF0ZSosIE1vZHVsZVByb2dyYW1FeGVjdXRhYmxlKiwgSlNWYWx1ZSBrZXksIEpTVmFs dWUgc2NyaXB0RmV0Y2hlcik7CiAKICAgICBTb3VyY2VDb2RlIG1fc291cmNlQ29kZTsKICAgICBW YXJpYWJsZUVudmlyb25tZW50IG1fZGVjbGFyZWRWYXJpYWJsZXM7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Nb2R1bGVMb2FkZXJQcm90b3R5cGUuY3BwIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTW9kdWxlTG9hZGVyUHJvdG90eXBlLmNwcAppbmRl eCA2NzE4NmU1MDRhZTk0MmE5YjZmZDY3YWIzZWEyZGFkMzZmZGIxYzIyLi43ZmYxY2NmMTM0ODMw OWUzNDE0ZTNjNDE1NzNjZDM3ZGI1OGViOTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9Nb2R1bGVMb2FkZXJQcm90b3R5cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL01vZHVsZUxvYWRlclByb3RvdHlwZS5jcHAKQEAgLTgwLDcgKzgw LDcgQEAgY29uc3QgQ2xhc3NJbmZvIE1vZHVsZUxvYWRlclByb3RvdHlwZTo6c19pbmZvID0geyAi TW9kdWxlTG9hZGVyIiwgJkJhc2U6OnNfaW5mbywKICAgICByZXF1ZXN0TGluayAgICAgICAgICAg ICAgICAgICAgSlNCdWlsdGluICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIERvbnRFbnVtfEZ1bmN0aW9uIDIKICAgICByZXF1ZXN0UmVhZHkgICAgICAgICAgICAgICAg ICAgSlNCdWlsdGluICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIERv bnRFbnVtfEZ1bmN0aW9uIDIKICAgICBsaW5rICAgICAgICAgICAgICAgICAgICAgICAgICAgSlNC dWlsdGluICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIERvbnRFbnVt fEZ1bmN0aW9uIDIKLSAgICBtb2R1bGVEZWNsYXJhdGlvbkluc3RhbnRpYXRpb24gbW9kdWxlTG9h ZGVyUHJvdG90eXBlTW9kdWxlRGVjbGFyYXRpb25JbnN0YW50aWF0aW9uIERvbnRFbnVtfEZ1bmN0 aW9uIDIKKyAgICBtb2R1bGVEZWNsYXJhdGlvbkluc3RhbnRpYXRpb24gbW9kdWxlTG9hZGVyUHJv dG90eXBlTW9kdWxlRGVjbGFyYXRpb25JbnN0YW50aWF0aW9uIERvbnRFbnVtfEZ1bmN0aW9uIDMK ICAgICBtb2R1bGVFdmFsdWF0aW9uICAgICAgICAgICAgICAgSlNCdWlsdGluICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIERvbnRFbnVtfEZ1bmN0aW9uIDIKICAgICBl dmFsdWF0ZSAgICAgICAgICAgICAgICAgICAgICAgbW9kdWxlTG9hZGVyUHJvdG90eXBlRXZhbHVh dGUgICAgICAgICAgICAgICAgICAgICAgIERvbnRFbnVtfEZ1bmN0aW9uIDMKICAgICBwcm92aWRl ICAgICAgICAgICAgICAgICAgICAgICAgSlNCdWlsdGluICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIERvbnRFbnVtfEZ1bmN0aW9uIDMKQEAgLTE2OCw3ICsxNjgsNyBA QCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIG1vZHVsZUxvYWRlclByb3RvdHlwZU1vZHVs ZURlY2xhcmF0aW9uSW5zdGFudGlhdGlvbgogICAgIGlmIChPcHRpb25zOjpkdW1wTW9kdWxlTG9h ZGluZ1N0YXRlKCkpCiAgICAgICAgIGRhdGFMb2coIkxvYWRlciBbbGlua10gIiwgbW9kdWxlUmVj b3JkLT5tb2R1bGVLZXkoKSwgIlxuIik7CiAKLSAgICBtb2R1bGVSZWNvcmQtPmxpbmsoZXhlYyk7 CisgICAgbW9kdWxlUmVjb3JkLT5saW5rKGV4ZWMsIGV4ZWMtPmFyZ3VtZW50KDEpLCBleGVjLT5h cmd1bWVudCgyKSk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZW5jb2RlZEpTVmFs dWUoKSk7CiAKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dCYXNlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93QmFzZS5jcHAKaW5kZXggN2Y1 MDBiMjljZmEwMDgxOTI5YjQ2YTNjMDgxNmFiMTcwM2EzZTQ4OC4uZjdkMzQxMmE1ODZhOTZjN2Ni M2ZhZTFlMzc3OGM2ZTVjNjZjY2I1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNET01XaW5kb3dCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0RPTVdpbmRvd0Jhc2UuY3BwCkBAIC03Myw2ICs3Myw3IEBAIGNvbnN0IEdsb2JhbE9iamVj dE1ldGhvZFRhYmxlIEpTRE9NV2luZG93QmFzZTo6c19nbG9iYWxPYmplY3RNZXRob2RUYWJsZSA9 IHsKICAgICAmbW9kdWxlTG9hZGVyUmVzb2x2ZSwKICAgICAmbW9kdWxlTG9hZGVyRmV0Y2gsCiAg ICAgbnVsbHB0ciwgLy8gbW9kdWxlTG9hZGVySW5zdGFudGlhdGUKKyAgICBudWxscHRyLCAvLyBt b2R1bGVMb2FkZXJDcmVhdGVJbXBvcnRNZXRhUHJvcGVydGllcwogICAgICZtb2R1bGVMb2FkZXJF dmFsdWF0ZSwKICAgICAmcHJvbWlzZVJlamVjdGlvblRyYWNrZXIsCiAgICAgJmRlZmF1bHRMYW5n dWFnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNXb3JrZXJHbG9i YWxTY29wZUJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNXb3JrZXJHbG9i YWxTY29wZUJhc2UuY3BwCmluZGV4IDM0YTUxYTU3MDg3Mzk4ZjM5MWFlNjc3Y2NiN2M4ZWNhMDlj NmZiNDYuLmUxOGIwMzE2NTFkNTgwMjQ4OGYyMjA3NmEyOGFjOTBiZjc1NDkzYWMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyR2xvYmFsU2NvcGVCYXNlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dvcmtlckdsb2JhbFNjb3BlQmFz ZS5jcHAKQEAgLTYwLDYgKzYwLDcgQEAgY29uc3QgR2xvYmFsT2JqZWN0TWV0aG9kVGFibGUgSlNX b3JrZXJHbG9iYWxTY29wZUJhc2U6OnNfZ2xvYmFsT2JqZWN0TWV0aG9kVGFibGUKICAgICBudWxs cHRyLCAvLyBtb2R1bGVMb2FkZXJSZXNvbHZlCiAgICAgbnVsbHB0ciwgLy8gbW9kdWxlTG9hZGVy RmV0Y2gKICAgICBudWxscHRyLCAvLyBtb2R1bGVMb2FkZXJJbnN0YW50aWF0ZQorICAgIG51bGxw dHIsIC8vIG1vZHVsZUxvYWRlckNyZWF0ZUltcG9ydE1ldGFQcm9wZXJ0aWVzCiAgICAgbnVsbHB0 ciwgLy8gbW9kdWxlTG9hZGVyRXZhbHVhdGUKICAgICBudWxscHRyLCAvLyBwcm9taXNlUmVqZWN0 aW9uVHJhY2tlcgogICAgICZkZWZhdWx0TGFuZ3VhZ2UKZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hh bmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzUxOTYwNjdhOWI1MzAwNzczNTY2YWQy NTU3NTI3OTYxYWJiNDA4ZS4uMGRkM2QzODczZTBmNWVlNWI3MjRlMmYyN2FlNDcyMDdmNDU1ZWUz MSAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOSBAQAorMjAxNy0wOS0zMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVh QGdtYWlsLmNvbT4KKworICAgICAgICBbSlNDXSBJbnRyb2R1Y2UgaW1wb3J0Lm1ldGEKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NzcwMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbW9kdWxlcy9pbXBv cnQtbWV0YS1zeW50YXguanM6IEFkZGVkLgorICAgICAgICAoc2hvdWxkVGhyb3cpOgorICAgICAg ICAoc2hvdWxkTm90VGhyb3cpOgorICAgICAgICAqIG1vZHVsZXMvaW1wb3J0LW1ldGEuanM6IEFk ZGVkLgorICAgICAgICAqIG1vZHVsZXMvaW1wb3J0LW1ldGEvY29jb2EuanM6IEFkZGVkLgorICAg ICAgICAqIG1vZHVsZXMvcmVzb3VyY2VzL2Fzc2VydC5qczoKKyAgICAgICAgKGV4cG9ydC5zaG91 bGROb3RUaHJvdyk6CisgICAgICAgICogc3RyZXNzL2ltcG9ydC1zeW50YXguanM6CisKIDIwMTct MDktMjkgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CiAKICAgICAgICAg W0RGR10gU3VwcG9ydCBBcnJheVB1c2ggd2l0aCBtdWx0aXBsZSBhcmdzCmRpZmYgLS1naXQgYS9K U1Rlc3RzL21vZHVsZXMvaW1wb3J0LW1ldGEtc3ludGF4LmpzIGIvSlNUZXN0cy9tb2R1bGVzL2lt cG9ydC1tZXRhLXN5bnRheC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zZWRmNGU1MTIwZTEyYTViNjg5NDkxM2Iw NWFhNzBhYzY3Njg1NjYyCi0tLSAvZGV2L251bGwKKysrIGIvSlNUZXN0cy9tb2R1bGVzL2ltcG9y dC1tZXRhLXN5bnRheC5qcwpAQCAtMCwwICsxLDI1IEBACitpbXBvcnQgeyBzaG91bGRUaHJvdywg c2hvdWxkTm90VGhyb3cgfSBmcm9tICIuL3Jlc291cmNlcy9hc3NlcnQuanMiOworCitzaG91bGRU aHJvdygoKSA9PiB7CisgICAgbmV3IEZ1bmN0aW9uKGBpbXBvcnQubWV0YWApOworfSwgYFN5bnRh eEVycm9yOiBpbXBvcnQubWV0YSBpcyBvbmx5IHZhbGlkIGluc2lkZSBtb2R1bGVzLmApOworCitz aG91bGROb3RUaHJvdygoKSA9PiB7CisgICAgY2hlY2tNb2R1bGVTeW50YXgoYGltcG9ydC5tZXRh YCk7Cit9KTsKKworc2hvdWxkVGhyb3coKCkgPT4geworICAgIGNoZWNrTW9kdWxlU3ludGF4KGAo aW1wb3J0LmNvY29hKWApOworfSwgYFN5bnRheEVycm9yOiBVbmV4cGVjdGVkIGlkZW50aWZpZXIg J2NvY29hJy4gImltcG9ydC4iIGNhbiBvbmx5IGZvbGxvd2VkIHdpdGggbWV0YS46MWApOworCitz aG91bGRUaHJvdygoKSA9PiB7CisgICAgY2hlY2tNb2R1bGVTeW50YXgoYChpbXBvcnRbIkNvY29h Il0pYCk7Cit9LCBgU3ludGF4RXJyb3I6IFVuZXhwZWN0ZWQgdG9rZW4gJ1snLiBpbXBvcnQgY2Fs bCBleHBlY3RzIGV4YWN0bHkgb25lIGFyZ3VtZW50LjoxYCk7CisKK3Nob3VsZFRocm93KCgpID0+ IHsKKyAgICBjaGVja01vZHVsZVN5bnRheChgaW1wb3J0LmNvY29hYCk7Cit9LCBgU3ludGF4RXJy b3I6IFVuZXhwZWN0ZWQgaWRlbnRpZmllciAnY29jb2EnLiAiaW1wb3J0LiIgY2FuIG9ubHkgZm9s bG93ZWQgd2l0aCBtZXRhLjoxYCk7CisKK3Nob3VsZFRocm93KCgpID0+IHsKKyAgICBjaGVja01v ZHVsZVN5bnRheChgaW1wb3J0WyJDb2NvYSJdYCk7Cit9LCBgU3ludGF4RXJyb3I6IFVuZXhwZWN0 ZWQgdG9rZW4gJ1snLiBFeHBlY3RlZCBuYW1lc3BhY2UgaW1wb3J0IG9yIGltcG9ydCBsaXN0Ljox YCk7CmRpZmYgLS1naXQgYS9KU1Rlc3RzL21vZHVsZXMvaW1wb3J0LW1ldGEuanMgYi9KU1Rlc3Rz L21vZHVsZXMvaW1wb3J0LW1ldGEuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDJmZDE0ZWRjZmVjYjA1YTQwOTZk Y2VhNmUzZDlmYmYwN2U0OGIxZAotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvbW9kdWxlcy9p bXBvcnQtbWV0YS5qcwpAQCAtMCwwICsxLDExIEBACitpbXBvcnQgeyBzaG91bGRCZSwgc2hvdWxk Tm90QmUgfSBmcm9tICIuL3Jlc291cmNlcy9hc3NlcnQuanMiOworaW1wb3J0IHsgY29jb2EgfSBm cm9tICIuL2ltcG9ydC1tZXRhL2NvY29hLmpzIgorCitzaG91bGROb3RCZShjb2NvYSwgaW1wb3J0 Lm1ldGEpOworc2hvdWxkQmUodHlwZW9mIGNvY29hLCAib2JqZWN0Iik7CitzaG91bGRCZSh0eXBl b2YgaW1wb3J0Lm1ldGEsICJvYmplY3QiKTsKK3Nob3VsZEJlKGltcG9ydC5tZXRhLmZpbGVuYW1l LmVuZHNXaXRoKCJpbXBvcnQtbWV0YS5qcyIpLCB0cnVlKTsKK3Nob3VsZEJlKGNvY29hLmZpbGVu YW1lLmVuZHNXaXRoKCJjb2NvYS5qcyIpLCB0cnVlKTsKKworc2hvdWxkQmUoUmVmbGVjdC5nZXRQ cm90b3R5cGVPZihjb2NvYSksIG51bGwpOworc2hvdWxkQmUoUmVmbGVjdC5nZXRQcm90b3R5cGVP ZihpbXBvcnQubWV0YSksIG51bGwpOwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9tb2R1bGVzL2ltcG9y dC1tZXRhL2NvY29hLmpzIGIvSlNUZXN0cy9tb2R1bGVzL2ltcG9ydC1tZXRhL2NvY29hLmpzCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjk2ZDEyMDU2ZWMyYWIyNmFmZDdlOThkNzE1Mzk2M2Y3NWI2NTVkZTcKLS0tIC9k ZXYvbnVsbAorKysgYi9KU1Rlc3RzL21vZHVsZXMvaW1wb3J0LW1ldGEvY29jb2EuanMKQEAgLTAs MCArMSw0IEBACitsZXQgbWV0YSA9IGltcG9ydC5tZXRhOworZXhwb3J0IHsKKyAgICBtZXRhIGFz IGNvY29hCit9CmRpZmYgLS1naXQgYS9KU1Rlc3RzL21vZHVsZXMvcmVzb3VyY2VzL2Fzc2VydC5q cyBiL0pTVGVzdHMvbW9kdWxlcy9yZXNvdXJjZXMvYXNzZXJ0LmpzCmluZGV4IGZiZjNiZDUxMWZi NTliMmE1NzNjNjJmZTIyZmY5ZWM1ZTE1M2M2OTMuLjZkOTRmYjA0YTM2NWEzODRlY2ZkYjI4ZDBh OWM2NTJkOWI4M2RhYmIgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvbW9kdWxlcy9yZXNvdXJjZXMvYXNz ZXJ0LmpzCisrKyBiL0pTVGVzdHMvbW9kdWxlcy9yZXNvdXJjZXMvYXNzZXJ0LmpzCkBAIC0yMiwz ICsyMiw3IEBAIGV4cG9ydCBmdW5jdGlvbiBzaG91bGRUaHJvdyhmdW5jLCBlcnJvck1lc3NhZ2Up IHsKICAgICBpZiAoU3RyaW5nKGVycm9yKSAhPT0gZXJyb3JNZXNzYWdlKQogICAgICAgICB0aHJv dyBuZXcgRXJyb3IoYGJhZCBlcnJvcjogJHtTdHJpbmcoZXJyb3IpfWApOwogfQorCitleHBvcnQg ZnVuY3Rpb24gc2hvdWxkTm90VGhyb3coZnVuYykgeworICAgIGZ1bmMoKTsKK30KZGlmZiAtLWdp dCBhL0pTVGVzdHMvc3RyZXNzL2ltcG9ydC1zeW50YXguanMgYi9KU1Rlc3RzL3N0cmVzcy9pbXBv cnQtc3ludGF4LmpzCmluZGV4IDkzNGZjZjI2MmIzMzcwZDNkZWIyMzkxMzkyYjQzNWU4ZWI0NGI3 ZjMuLjJiOTZiZTRkN2Q5YzRjYjIwOTA4YzliMGJiN2FhNTUwZjEyNGYyNjYgMTAwNjQ0Ci0tLSBh L0pTVGVzdHMvc3RyZXNzL2ltcG9ydC1zeW50YXguanMKKysrIGIvSlNUZXN0cy9zdHJlc3MvaW1w b3J0LXN5bnRheC5qcwpAQCAtMjcsNyArMjcsNyBAQCBhc3luYyBmdW5jdGlvbiB0ZXN0U3ludGF4 KHNjcmlwdCwgbWVzc2FnZSkgewogCiB0ZXN0U3ludGF4RXJyb3IoYGltcG9ydClgLCBgU3ludGF4 RXJyb3I6IFVuZXhwZWN0ZWQgdG9rZW4gJyknLiBpbXBvcnQgY2FsbCBleHBlY3RzIGV4YWN0bHkg b25lIGFyZ3VtZW50LmApOwogdGVzdFN5bnRheEVycm9yKGBuZXcgaW1wb3J0KGAsIGBTeW50YXhF cnJvcjogQ2Fubm90IHVzZSBuZXcgd2l0aCBpbXBvcnQuYCk7Ci10ZXN0U3ludGF4RXJyb3IoYGlt cG9ydC5oZWxsbygpYCwgYFN5bnRheEVycm9yOiBVbmV4cGVjdGVkIHRva2VuICcuJy4gaW1wb3J0 IGNhbGwgZXhwZWN0cyBleGFjdGx5IG9uZSBhcmd1bWVudC5gKTsKK3Rlc3RTeW50YXhFcnJvcihg aW1wb3J0LmhlbGxvKClgLCBgU3ludGF4RXJyb3I6IFVuZXhwZWN0ZWQgaWRlbnRpZmllciAnaGVs bG8nLiAiaW1wb3J0LiIgY2FuIG9ubHkgZm9sbG93ZWQgd2l0aCBtZXRhLmApOwogdGVzdFN5bnRh eEVycm9yKGBpbXBvcnRbYCwgYFN5bnRheEVycm9yOiBVbmV4cGVjdGVkIHRva2VuICdbJy4gaW1w b3J0IGNhbGwgZXhwZWN0cyBleGFjdGx5IG9uZSBhcmd1bWVudC5gKTsKIHRlc3RTeW50YXhFcnJv cihgaW1wb3J0PGAsIGBTeW50YXhFcnJvcjogVW5leHBlY3RlZCB0b2tlbiAnPCcuIGltcG9ydCBj YWxsIGV4cGVjdHMgZXhhY3RseSBvbmUgYXJndW1lbnQuYCk7CiAK