206888 2020-01-28 09:52:43 -0800 [ESNext][BigInt] We don't support BigInt literal as PropertyName 2020-02-13 14:00:16 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ticaiolima ticaiolima commit-queue ews-watchlist keith_miller mark.lam msaboff rmorisset ross.kirsling saam tzagallo webkit-bug-importer oldest_to_newest 1612008 0 ticaiolima 2020-01-28 09:52:43 -0800 According to spec, BigInt is a valid PropertyName (https://tc39.es/ecma262/#prod-PropertyName) and it should be evaluated using ToString (https://tc39.es/ecma262/#sec-object-initializer-runtime-semantics-evaluation). Given this, this script should be evaluated without error: ``` // Object Literal let o = { 1n: "foo" }; assert(a[1n] === "foo"); assert(a[1] === "foo"); assert(a["1"] === "foo"); // MethodDeclaration o = { 1n() => "bar" }; assert(a[1n]() === "bar"); assert(a[1]() === "bar"); assert(a["1"]() === "bar"); class C { 1n() { return "baz"; } } let c = new C(); assert(c.[1n]() === "baz"); assert(c.[1]() === "baz"); assert(c.["1"] === "baz"); // Destructuring let {1n: a} = {1n: "foo"}; assert(a === "foo"); ``` Original report from https://bugzilla.mozilla.org/show_bug.cgi?id=1605835 1612030 1 ticaiolima 2020-01-28 10:15:27 -0800 Oops, previous script is not correct. Correct version is: ``` // Object Literal let o = { 1n: "foo" }; assert.sameValue(o[1n], "foo"); assert.sameValue(o[1], "foo"); assert.sameValue(o["1"], "foo"); // MethodDeclaration o = { 1n() { return "bar"; } }; assert.sameValue(o[1n](), "bar"); assert.sameValue(o[1](), "bar"); assert.sameValue(o["1"](), "bar"); class C { 1n() { return "baz"; } } let c = new C(); assert.sameValue(c[1n](), "baz"); assert.sameValue(c[1](), "baz"); assert.sameValue(c["1"](), "baz"); // Destructuring let {1n: a} = {1n: "foo"}; assert.sameValue(a, "foo"); ``` 1612039 2 389029 ticaiolima 2020-01-28 10:28:37 -0800 Created attachment 389029 Patch 1617378 3 390368 ticaiolima 2020-02-11 07:23:31 -0800 Created attachment 390368 Patch 1617454 4 ross.kirsling 2020-02-11 10:02:34 -0800 Wow, interesting that every engine missed this! Looks like this is the test262 PR? https://github.com/tc39/test262/pull/2457 1617476 5 390368 ross.kirsling 2020-02-11 10:27:21 -0800 Comment on attachment 390368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390368&action=review r=me with comments. Seems like Mozilla's tests also cover binary/octal/hex literals: https://searchfox.org/mozilla-central/source/js/src/tests/non262/BigInt/property-name.js Do you think it's worth adding tests for these (maybe not necessary since they're all just BIGINT tokens)? > Source/JavaScriptCore/parser/Parser.cpp:4177 > + InferName inferName = ident && *ident == m_vm.propertyNames->underscoreProto ? InferName::Disallowed : InferName::Allowed; bigIntString can't be underscoreProto though, can it? Should this be an ASSERT? > JSTests/ChangeLog:8 > + * stress/big-int-as-proeprty-name.js: Added. Nit: spelling in filename :p 1617495 6 390368 ticaiolima 2020-02-11 10:55:54 -0800 Comment on attachment 390368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390368&action=review I don't think it hurts to add tests with binary, octals and hexdecimals. I'll add those as well. >> Source/JavaScriptCore/parser/Parser.cpp:4177 >> + InferName inferName = ident && *ident == m_vm.propertyNames->underscoreProto ? InferName::Disallowed : InferName::Allowed; > > bigIntString can't be underscoreProto though, can it? Should this be an ASSERT? This should not be here! I think I'll put InferName::Allowed directly on createProperty. >> JSTests/ChangeLog:8 >> + * stress/big-int-as-proeprty-name.js: Added. > > Nit: spelling in filename :p Oops. 1617613 7 390419 ticaiolima 2020-02-11 14:02:00 -0800 Created attachment 390419 Patch 1617614 8 ticaiolima 2020-02-11 14:04:04 -0800 (In reply to Ross Kirsling from comment #5) > Comment on attachment 390368 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=390368&action=review > > r=me with comments. > > Seems like Mozilla's tests also cover binary/octal/hex literals: > https://searchfox.org/mozilla-central/source/js/src/tests/non262/BigInt/ > property-name.js > Do you think it's worth adding tests for these (maybe not necessary since > they're all just BIGINT tokens)? It turns out that those cases found a bug on implementation! Thank you for pointing this out. I updated a new version of the patch to handle cases when we use non-decimal literals. Do you mind take another look? 1617702 9 390419 ross.kirsling 2020-02-11 15:44:54 -0800 Comment on attachment 390419 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390419&action=review Hooray for tests finding bugs! > Source/JavaScriptCore/parser/ParserArena.cpp:90 > + // FIXME: We are allocating a JSBigInt just to be able to use > + // JSBigInt::tryGetString when radix is not 10. > + // This creates some GC pressure, but since these identifiers > + // will only be created when BigInt literal is used as a property name, > + // it wont be much problematic, given such cases are very rare. Should this FIXME have a bug? 1617938 10 ticaiolima 2020-02-12 05:05:45 -0800 (In reply to Ross Kirsling from comment #9) > Comment on attachment 390419 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=390419&action=review > > Hooray for tests finding bugs! > > > Source/JavaScriptCore/parser/ParserArena.cpp:90 > > + // FIXME: We are allocating a JSBigInt just to be able to use > > + // JSBigInt::tryGetString when radix is not 10. > > + // This creates some GC pressure, but since these identifiers > > + // will only be created when BigInt literal is used as a property name, > > + // it wont be much problematic, given such cases are very rare. > > Should this FIXME have a bug? Yes. I was waiting until get an r+ before creating it. I created https://bugs.webkit.org/show_bug.cgi?id=207627. 1617943 11 390507 ticaiolima 2020-02-12 05:30:44 -0800 Created attachment 390507 Patch 1618680 12 390507 ticaiolima 2020-02-13 13:17:13 -0800 Comment on attachment 390507 Patch Thank you very much for the review! 1618696 13 390507 commit-queue 2020-02-13 13:59:16 -0800 Comment on attachment 390507 Patch Clearing flags on attachment: 390507 Committed r256541: <https://trac.webkit.org/changeset/256541> 1618697 14 commit-queue 2020-02-13 13:59:18 -0800 All reviewed patches have been landed. Closing bug. 1618698 15 webkit-bug-importer 2020-02-13 14:00:16 -0800 <rdar://problem/59436664> 389029 2020-01-28 10:28:37 -0800 2020-02-11 07:23:28 -0800 Patch bug-206888-20200128152835.patch text/plain 4438 ticaiolima U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1MjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz Y2U5ZjRiMmYyMjdhY2ViOGQ2OTE5MjA2YjgwNjA1NWRiMmM4OTQyLi5kM2M0YTM4MDVmMzUzNGFj NTA4YjE0YzI5NzMzODQ0YTc5NjcwMTgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAyMC0wMS0yOCAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFpbC5jb20+ CisKKyAgICAgICAgW0VTTmV4dF1bQmlnSW50XSBXZSBkb24ndCBzdXBwb3J0IEJpZ0ludCBsaXRl cmFsIGFzIFByb3BlcnR5TmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA2ODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWNjb3JkaW5nIHRvIHNwZWMgKGh0dHBzOi8vdGMzOS5lcy9lY21hMjYyLyNw cm9kLVByb3BlcnR5TmFtZSkKKyAgICAgICAgQmlnSW50IGxpdGVyYWxzIGFyZSB2YWxpZCBwcm9w ZXJ0eSBuYW1lcy4gR2l2ZW4gdGhhdCwgd2Ugc2hvdWxkIG5vdAorICAgICAgICB0aHJvdyBhIFN5 bnRheEVycm9yIHdoZW4gdXNpbmcgQmlnSW50IGxpdGVyYWxzIG9uIGRlc3RydWN0dXJpbmcKKyAg ICAgICAgcGF0dGVybiwgbWV0aG9kIGRlY2xhcmF0aW9uLCBvYmplY3QgbGl0ZXJhbHMsIGV0Yy4K KyAgICAgICAgVGhpcyBwYXRjaCBpcyBhZGRpbmcgQmlnSW50IGxpdGVyYWwgYXMgYSB2YWxpZCBz eW50YXggdG8gUHJvcGVydHlOYW1lLgorCisgICAgICAgICogcGFyc2VyL1BhcnNlci5jcHA6Cisg ICAgICAgIChKU0M6OlBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZURlc3RydWN0dXJpbmdQYXR0ZXJu KToKKyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlQ2xhc3MpOgorICAgICAg ICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VJbnN0YW5jZUZpZWxkSW5pdGlhbGl6ZXJT b3VyY2VFbGVtZW50cyk6CisgICAgICAgIChKU0M6OlBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZVBy b3BlcnR5KToKKwogMjAyMC0wMS0yNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gUmVtb3RlIEluc3BlY3RvcjogYWRkIHN1cHBvcnQg Zm9yIHNlcnZpY2Ugd29ya2VycyB0YXJnZXRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcGFyc2VyL1BhcnNlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1Bh cnNlci5jcHAKaW5kZXggYjgxMTMyYjNlZGQ2YTQ4OWRiMjI3YmM3MTExMDQ0NDRjNTljMDYwZC4u ODgyOTNlNGQ2YmRiMDJkNDE0NzNhZDhhYjdjNzEwM2E5OTlhZWRlMyAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcApAQCAtMTIyMSw2ICsxMjIxLDkgQEAgdGVtcGxhdGUg PGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlRGVzdHJ1Y3R1cmluZ1BhdHRlcm4gUGFyc2VyPExleGVy VHlwZT46OnBhcnNlRGUKICAgICAgICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lID0gbV90b2tl bi5tX2RhdGEuaWRlbnQ7CiAgICAgICAgICAgICAgICAgICAgIHdhc1N0cmluZyA9IHRydWU7CiAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGNhc2UgQklHSU5UOgor ICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eU5hbWUgPSBtX3Rva2VuLm1fZGF0YS5iaWdJbnRT dHJpbmc7CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIGNhc2Ug T1BFTkJSQUNLRVQ6CiAgICAgICAgICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAgICAgICAg ICAgICAgcHJvcGVydHlFeHByZXNzaW9uID0gcGFyc2VBc3NpZ25tZW50RXhwcmVzc2lvbihjb250 ZXh0KTsKQEAgLTI4OTEsNiArMjg5NCwxMSBAQCBwYXJzZU1ldGhvZDoKICAgICAgICAgICAgIEFT U0VSVChpZGVudCk7CiAgICAgICAgICAgICBuZXh0KCk7CiAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgY2FzZSBCSUdJTlQ6CisgICAgICAgICAgICBpZGVudCA9IG1fdG9rZW4ubV9kYXRhLmJp Z0ludFN0cmluZzsKKyAgICAgICAgICAgIEFTU0VSVChpZGVudCk7CisgICAgICAgICAgICBuZXh0 KCk7CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBJREVOVDoKICAgICAgICAgICAg IGlmIChVTkxJS0VMWSgqbV90b2tlbi5tX2RhdGEuaWRlbnQgPT0gbV92bS5wcm9wZXJ0eU5hbWVz LT5hc3luYyAmJiAhbV90b2tlbi5tX2RhdGEuZXNjYXBlZCkpIHsKICAgICAgICAgICAgICAgICBp ZiAoIWlzR2VuZXJhdG9yTWV0aG9kUGFyc2VNb2RlKHBhcnNlTW9kZSkgJiYgIWlzQXN5bmNNZXRo b2RQYXJzZU1vZGUocGFyc2VNb2RlKSkgewpAQCAtMzAzOSw2ICszMDQ3LDExIEBAIHRlbXBsYXRl IDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZVNvdXJjZUVsZW1lbnRzIFBhcnNlcjxMZXhlclR5cGU+ OjpwYXJzZUluc3RhbmNlCiAgICAgICAgICAgICBBU1NFUlQoaWRlbnQpOwogICAgICAgICAgICAg bmV4dCgpOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgQklHSU5UOgorICAgICAg ICAgICAgaWRlbnQgPSBtX3Rva2VuLm1fZGF0YS5iaWdJbnRTdHJpbmc7CisgICAgICAgICAgICBB U1NFUlQoaWRlbnQpOworICAgICAgICAgICAgbmV4dCgpOworICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIGNhc2UgRE9VQkxFOgogICAgICAgICBjYXNlIElOVEVHRVI6CiAgICAgICAgICAgICBp ZGVudCA9ICZtX3BhcnNlckFyZW5hLmlkZW50aWZpZXJBcmVuYSgpLm1ha2VOdW1lcmljSWRlbnRp Zmllcihjb25zdF9jYXN0PFZNJj4obV92bSksIG1fdG9rZW4ubV9kYXRhLmRvdWJsZVZhbHVlKTsK QEAgLTQxNTAsNiArNDE2MywyMyBAQCBuYW1lZFByb3BlcnR5OgogICAgICAgICBjb250ZXh0LnNl dEVuZE9mZnNldChub2RlLCBtX2xleGVyLT5jdXJyZW50T2Zmc2V0KCkpOwogICAgICAgICByZXR1 cm4gY29udGV4dC5jcmVhdGVQcm9wZXJ0eShjb25zdF9jYXN0PFZNJj4obV92bSksIG1fcGFyc2Vy QXJlbmEsIHByb3BlcnR5TmFtZSwgbm9kZSwgUHJvcGVydHlOb2RlOjpDb25zdGFudCwgUHJvcGVy dHlOb2RlOjpVbmtub3duLCBjb21wbGV0ZSwgU3VwZXJCaW5kaW5nOjpOb3ROZWVkZWQsIENsYXNz RWxlbWVudFRhZzo6Tm8pOwogICAgIH0KKyAgICBjYXNlIEJJR0lOVDogeworICAgICAgICBjb25z dCBJZGVudGlmaWVyKiBpZGVudCA9IG1fdG9rZW4ubV9kYXRhLmJpZ0ludFN0cmluZzsKKyAgICAg ICAgbmV4dCgpOworCisgICAgICAgIGlmIChtYXRjaChPUEVOUEFSRU4pKSB7CisgICAgICAgICAg ICBhdXRvIG1ldGhvZCA9IHBhcnNlUHJvcGVydHlNZXRob2QoY29udGV4dCwgaWRlbnQsIHBhcnNl TW9kZSk7CisgICAgICAgICAgICBwcm9wYWdhdGVFcnJvcigpOworICAgICAgICAgICAgcmV0dXJu IGNvbnRleHQuY3JlYXRlUHJvcGVydHkoaWRlbnQsIG1ldGhvZCwgUHJvcGVydHlOb2RlOjpDb25z dGFudCwgUHJvcGVydHlOb2RlOjpVbmtub3duLCBjb21wbGV0ZSwgU3VwZXJCaW5kaW5nOjpOZWVk ZWQsIEluZmVyTmFtZTo6QWxsb3dlZCwgQ2xhc3NFbGVtZW50VGFnOjpObyk7CisgICAgICAgIH0K KyAgICAgICAgZmFpbElmVHJ1ZShwYXJzZU1vZGUgIT0gU291cmNlUGFyc2VNb2RlOjpNZXRob2RN b2RlLCAiRXhwZWN0ZWQgYSBwYXJlbnRoZXNpcyBmb3IgYXJndW1lbnQgbGlzdCIpOworCisgICAg ICAgIGNvbnN1bWVPckZhaWwoQ09MT04sICJFeHBlY3RlZCAnOicgYWZ0ZXIgcHJvcGVydHkgbmFt ZSIpOworICAgICAgICBUcmVlRXhwcmVzc2lvbiBub2RlID0gcGFyc2VBc3NpZ25tZW50RXhwcmVz c2lvbihjb250ZXh0KTsKKyAgICAgICAgZmFpbElmRmFsc2Uobm9kZSwgIkNhbm5vdCBwYXJzZSBl eHByZXNzaW9uIGZvciBwcm9wZXJ0eSBkZWNsYXJhdGlvbiIpOworICAgICAgICBjb250ZXh0LnNl dEVuZE9mZnNldChub2RlLCBtX2xleGVyLT5jdXJyZW50T2Zmc2V0KCkpOworICAgICAgICByZXR1 cm4gY29udGV4dC5jcmVhdGVQcm9wZXJ0eShpZGVudCwgbm9kZSwgUHJvcGVydHlOb2RlOjpDb25z dGFudCwgUHJvcGVydHlOb2RlOjpVbmtub3duLCBjb21wbGV0ZSwgU3VwZXJCaW5kaW5nOjpOb3RO ZWVkZWQsIEluZmVyTmFtZTo6QWxsb3dlZCwgQ2xhc3NFbGVtZW50VGFnOjpObyk7CisgICAgfQog ICAgIGNhc2UgT1BFTkJSQUNLRVQ6IHsKICAgICAgICAgbmV4dCgpOwogICAgICAgICBhdXRvIHBy b3BlcnR5TmFtZSA9IHBhcnNlQXNzaWdubWVudEV4cHJlc3Npb24oY29udGV4dCk7Cg== 390368 2020-02-11 07:23:31 -0800 2020-02-11 14:01:55 -0800 Patch bug-206888-20200211122329.patch text/plain 7922 ticaiolima U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2MzAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm YzI2YjJhZGYwNWQxYWY1ODlmMmExOGEwMmJmMjQ0ZGM0ZDE1MTM1Li42ZDJiNDQ3MzdlZDgzOGUx Mjk1NWJkMTY0OGY3MWE4ZGI4MmRlYTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAyMC0wMi0xMSAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFpbC5jb20+ CisKKyAgICAgICAgW0VTTmV4dF1bQmlnSW50XSBXZSBkb24ndCBzdXBwb3J0IEJpZ0ludCBsaXRl cmFsIGFzIFByb3BlcnR5TmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA2ODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWNjb3JkaW5nIHRvIHNwZWMgKGh0dHBzOi8vdGMzOS5lcy9lY21hMjYyLyNw cm9kLVByb3BlcnR5TmFtZSksCisgICAgICAgIEJpZ0ludCBsaXRlcmFscyBhcmUgdmFsaWQgcHJv cGVydHkgbmFtZXMuIEdpdmVuIHRoYXQsIHdlIHNob3VsZCBub3QKKyAgICAgICAgdGhyb3cgYSBT eW50YXhFcnJvciB3aGVuIHVzaW5nIEJpZ0ludCBsaXRlcmFscyBvbiBkZXN0cnVjdHVyaW5nCisg ICAgICAgIHBhdHRlcm4sIG1ldGhvZCBkZWNsYXJhdGlvbiwgb2JqZWN0IGxpdGVyYWxzLCBldGMu CisgICAgICAgIFRoaXMgcGF0Y2ggaXMgYWRkaW5nIEJpZ0ludCBsaXRlcmFsIGFzIGEgdmFsaWQg c3ludGF4IHRvIFByb3BlcnR5TmFtZS4KKworICAgICAgICAqIHBhcnNlci9QYXJzZXIuY3BwOgor ICAgICAgICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VEZXN0cnVjdHVyaW5nUGF0dGVy bik6CisgICAgICAgIChKU0M6OlBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUNsYXNzKToKKyAgICAg ICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlSW5zdGFuY2VGaWVsZEluaXRpYWxpemVy U291cmNlRWxlbWVudHMpOgorICAgICAgICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VQ cm9wZXJ0eSk6CisgICAgICAgIChKU0M6OlBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUdldHRlclNl dHRlcik6CisKIDIwMjAtMDItMTAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAg ICAgICAgIFBsYWNhdGUgZXhjZXB0aW9uIGNoZWNrIHZhbGlkYXRvciBpbiBHZW5lcmljQXJndW1l bnRzPFR5cGU+OjpwdXQoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJz ZXIvUGFyc2VyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcApp bmRleCBjMmZhNjA3ZjI3OGYyN2MzMzUxZWQxOTg3YjgzMWVhNjkyNDJkOTk2Li5mMDA5MmFmNjk2 YWI1ZDVhYTE3ZjUwY2YxM2Y1MDRiMzNmYmJkZDA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Bh cnNlci9QYXJzZXIuY3BwCkBAIC0xMjIyLDYgKzEyMjIsOSBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJl ZUJ1aWxkZXI+IFRyZWVEZXN0cnVjdHVyaW5nUGF0dGVybiBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFy c2VEZQogICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eU5hbWUgPSBtX3Rva2VuLm1fZGF0YS5p ZGVudDsKICAgICAgICAgICAgICAgICAgICAgd2FzU3RyaW5nID0gdHJ1ZTsKICAgICAgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgY2FzZSBCSUdJTlQ6CisgICAgICAgICAg ICAgICAgICAgIHByb3BlcnR5TmFtZSA9IG1fdG9rZW4ubV9kYXRhLmJpZ0ludFN0cmluZzsKKyAg ICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgY2FzZSBPUEVOQlJBQ0tF VDoKICAgICAgICAgICAgICAgICAgICAgbmV4dCgpOwogICAgICAgICAgICAgICAgICAgICBwcm9w ZXJ0eUV4cHJlc3Npb24gPSBwYXJzZUFzc2lnbm1lbnRFeHByZXNzaW9uKGNvbnRleHQpOwpAQCAt Mjg5Miw2ICsyODk1LDExIEBAIHBhcnNlTWV0aG9kOgogICAgICAgICAgICAgQVNTRVJUKGlkZW50 KTsKICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNl IEJJR0lOVDoKKyAgICAgICAgICAgIGlkZW50ID0gbV90b2tlbi5tX2RhdGEuYmlnSW50U3RyaW5n OworICAgICAgICAgICAgQVNTRVJUKGlkZW50KTsKKyAgICAgICAgICAgIG5leHQoKTsKKyAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIElERU5UOgogICAgICAgICAgICAgaWYgKFVOTElL RUxZKCptX3Rva2VuLm1fZGF0YS5pZGVudCA9PSBtX3ZtLnByb3BlcnR5TmFtZXMtPmFzeW5jICYm ICFtX3Rva2VuLm1fZGF0YS5lc2NhcGVkKSkgewogICAgICAgICAgICAgICAgIGlmICghaXNHZW5l cmF0b3JNZXRob2RQYXJzZU1vZGUocGFyc2VNb2RlKSAmJiAhaXNBc3luY01ldGhvZFBhcnNlTW9k ZShwYXJzZU1vZGUpKSB7CkBAIC0yOTEyLDcgKzI5MjAsNyBAQCBwYXJzZU1ldGhvZDoKICAgICAg ICAgICAgIGlkZW50ID0gbV90b2tlbi5tX2RhdGEuaWRlbnQ7CiAgICAgICAgICAgICBBU1NFUlQo aWRlbnQpOwogICAgICAgICAgICAgbmV4dCgpOwotICAgICAgICAgICAgaWYgKHBhcnNlTW9kZSA9 PSBTb3VyY2VQYXJzZU1vZGU6Ok1ldGhvZE1vZGUgJiYgKG1hdGNoSWRlbnRpZmllck9yS2V5d29y ZCgpIHx8IG1hdGNoKFNUUklORykgfHwgbWF0Y2goRE9VQkxFKSB8fCBtYXRjaChJTlRFR0VSKSB8 fCBtYXRjaChPUEVOQlJBQ0tFVCkpKSB7CisgICAgICAgICAgICBpZiAocGFyc2VNb2RlID09IFNv dXJjZVBhcnNlTW9kZTo6TWV0aG9kTW9kZSAmJiAobWF0Y2hJZGVudGlmaWVyT3JLZXl3b3JkKCkg fHwgbWF0Y2goU1RSSU5HKSB8fCBtYXRjaChET1VCTEUpIHx8IG1hdGNoKElOVEVHRVIpIHx8IG1h dGNoKEJJR0lOVCkgfHwgbWF0Y2goT1BFTkJSQUNLRVQpKSkgewogICAgICAgICAgICAgICAgIGlz R2V0dGVyID0gKmlkZW50ID09IHByb3BlcnR5TmFtZXMuZ2V0OwogICAgICAgICAgICAgICAgIGlz U2V0dGVyID0gKmlkZW50ID09IHByb3BlcnR5TmFtZXMuc2V0OwogICAgICAgICAgICAgfQpAQCAt MzA0MCw2ICszMDQ4LDExIEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZVNvdXJj ZUVsZW1lbnRzIFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUluc3RhbmNlCiAgICAgICAgICAgICBB U1NFUlQoaWRlbnQpOwogICAgICAgICAgICAgbmV4dCgpOwogICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgIGNhc2UgQklHSU5UOgorICAgICAgICAgICAgaWRlbnQgPSBtX3Rva2VuLm1fZGF0YS5i aWdJbnRTdHJpbmc7CisgICAgICAgICAgICBBU1NFUlQoaWRlbnQpOworICAgICAgICAgICAgbmV4 dCgpOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRE9VQkxFOgogICAgICAgICBj YXNlIElOVEVHRVI6CiAgICAgICAgICAgICBpZGVudCA9ICZtX3BhcnNlckFyZW5hLmlkZW50aWZp ZXJBcmVuYSgpLm1ha2VOdW1lcmljSWRlbnRpZmllcihjb25zdF9jYXN0PFZNJj4obV92bSksIG1f dG9rZW4ubV9kYXRhLmRvdWJsZVZhbHVlKTsKQEAgLTQxNDYsNiArNDE1OSwyNCBAQCBuYW1lZFBy b3BlcnR5OgogICAgICAgICBjb250ZXh0LnNldEVuZE9mZnNldChub2RlLCBtX2xleGVyLT5jdXJy ZW50T2Zmc2V0KCkpOwogICAgICAgICByZXR1cm4gY29udGV4dC5jcmVhdGVQcm9wZXJ0eShjb25z dF9jYXN0PFZNJj4obV92bSksIG1fcGFyc2VyQXJlbmEsIHByb3BlcnR5TmFtZSwgbm9kZSwgUHJv cGVydHlOb2RlOjpDb25zdGFudCwgUHJvcGVydHlOb2RlOjpVbmtub3duLCBjb21wbGV0ZSwgU3Vw ZXJCaW5kaW5nOjpOb3ROZWVkZWQsIENsYXNzRWxlbWVudFRhZzo6Tm8pOwogICAgIH0KKyAgICBj YXNlIEJJR0lOVDogeworICAgICAgICBjb25zdCBJZGVudGlmaWVyKiBpZGVudCA9IG1fdG9rZW4u bV9kYXRhLmJpZ0ludFN0cmluZzsKKyAgICAgICAgbmV4dCgpOworCisgICAgICAgIGlmIChtYXRj aChPUEVOUEFSRU4pKSB7CisgICAgICAgICAgICBhdXRvIG1ldGhvZCA9IHBhcnNlUHJvcGVydHlN ZXRob2QoY29udGV4dCwgaWRlbnQsIHBhcnNlTW9kZSk7CisgICAgICAgICAgICBwcm9wYWdhdGVF cnJvcigpOworICAgICAgICAgICAgcmV0dXJuIGNvbnRleHQuY3JlYXRlUHJvcGVydHkoaWRlbnQs IG1ldGhvZCwgUHJvcGVydHlOb2RlOjpDb25zdGFudCwgUHJvcGVydHlOb2RlOjpVbmtub3duLCBj b21wbGV0ZSwgU3VwZXJCaW5kaW5nOjpOZWVkZWQsIEluZmVyTmFtZTo6QWxsb3dlZCwgQ2xhc3NF bGVtZW50VGFnOjpObyk7CisgICAgICAgIH0KKyAgICAgICAgZmFpbElmVHJ1ZShwYXJzZU1vZGUg IT0gU291cmNlUGFyc2VNb2RlOjpNZXRob2RNb2RlLCAiRXhwZWN0ZWQgYSBwYXJlbnRoZXNpcyBm b3IgYXJndW1lbnQgbGlzdCIpOworCisgICAgICAgIGNvbnN1bWVPckZhaWwoQ09MT04sICJFeHBl Y3RlZCAnOicgYWZ0ZXIgcHJvcGVydHkgbmFtZSIpOworICAgICAgICBUcmVlRXhwcmVzc2lvbiBu b2RlID0gcGFyc2VBc3NpZ25tZW50RXhwcmVzc2lvbihjb250ZXh0KTsKKyAgICAgICAgZmFpbElm RmFsc2Uobm9kZSwgIkNhbm5vdCBwYXJzZSBleHByZXNzaW9uIGZvciBwcm9wZXJ0eSBkZWNsYXJh dGlvbiIpOworICAgICAgICBjb250ZXh0LnNldEVuZE9mZnNldChub2RlLCBtX2xleGVyLT5jdXJy ZW50T2Zmc2V0KCkpOworICAgICAgICBJbmZlck5hbWUgaW5mZXJOYW1lID0gaWRlbnQgJiYgKmlk ZW50ID09IG1fdm0ucHJvcGVydHlOYW1lcy0+dW5kZXJzY29yZVByb3RvID8gSW5mZXJOYW1lOjpE aXNhbGxvd2VkIDogSW5mZXJOYW1lOjpBbGxvd2VkOworICAgICAgICByZXR1cm4gY29udGV4dC5j cmVhdGVQcm9wZXJ0eShpZGVudCwgbm9kZSwgUHJvcGVydHlOb2RlOjpDb25zdGFudCwgUHJvcGVy dHlOb2RlOjpVbmtub3duLCBjb21wbGV0ZSwgU3VwZXJCaW5kaW5nOjpOb3ROZWVkZWQsIGluZmVy TmFtZSwgQ2xhc3NFbGVtZW50VGFnOjpObyk7CisgICAgfQogICAgIGNhc2UgT1BFTkJSQUNLRVQ6 IHsKICAgICAgICAgbmV4dCgpOwogICAgICAgICBhdXRvIHByb3BlcnR5TmFtZSA9IHBhcnNlQXNz aWdubWVudEV4cHJlc3Npb24oY29udGV4dCk7CkBAIC00MjE0LDYgKzQyNDUsOSBAQCB0ZW1wbGF0 ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVQcm9wZXJ0eSBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFy c2VHZXR0ZXJTZXR0ZXIoVAogICAgIH0gZWxzZSBpZiAobWF0Y2goRE9VQkxFKSB8fCBtYXRjaChJ TlRFR0VSKSkgewogICAgICAgICBudW1lcmljUHJvcGVydHlOYW1lID0gbV90b2tlbi5tX2RhdGEu ZG91YmxlVmFsdWU7CiAgICAgICAgIG5leHQoKTsKKyAgICB9IGVsc2UgaWYgKG1hdGNoKEJJR0lO VCkpIHsKKyAgICAgICAgc3RyaW5nUHJvcGVydHlOYW1lID0gbV90b2tlbi5tX2RhdGEuYmlnSW50 U3RyaW5nOworICAgICAgICBuZXh0KCk7CiAgICAgfSBlbHNlIGlmIChtYXRjaChPUEVOQlJBQ0tF VCkpIHsKICAgICAgICAgbmV4dCgpOwogICAgICAgICBjb21wdXRlZFByb3BlcnR5TmFtZSA9IHBh cnNlQXNzaWdubWVudEV4cHJlc3Npb24oY29udGV4dCk7CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0No YW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGY5ZTExYmQ0NzliYTE1MDQ3NDhmNTgz YmE2ZmEzMTI1ZTM3ODQ1MzEuLjc4YWZmOTkxN2NmZGNjODE1NGVkMjEzM2M2NGZkMzc3ODIyY2Fh MzkgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDItMTEgIENhaW8gTGltYSAgPHRpY2Fpb2xpbWFAZ21h aWwuY29tPgorCisgICAgICAgIFtFU05leHRdW0JpZ0ludF0gV2UgZG9uJ3Qgc3VwcG9ydCBCaWdJ bnQgbGl0ZXJhbCBhcyBQcm9wZXJ0eU5hbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIwNjg4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogc3RyZXNzL2JpZy1pbnQtYXMtcHJvZXBydHktbmFtZS5qczog QWRkZWQuCisKIDIwMjAtMDItMTAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAg ICAgICAgIFBsYWNhdGUgZXhjZXB0aW9uIGNoZWNrIHZhbGlkYXRvciBpbiBHZW5lcmljQXJndW1l bnRzPFR5cGU+OjpwdXQoKS4KZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL2JpZy1pbnQtYXMt cHJvZXBydHktbmFtZS5qcyBiL0pTVGVzdHMvc3RyZXNzL2JpZy1pbnQtYXMtcHJvZXBydHktbmFt ZS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi41ZGIxMTBlYWVkOWMwZjg1NzhlY2ExMzM2ZjAxMzZmOTNhMWMxNTc2 Ci0tLSAvZGV2L251bGwKKysrIGIvSlNUZXN0cy9zdHJlc3MvYmlnLWludC1hcy1wcm9lcHJ0eS1u YW1lLmpzCkBAIC0wLDAgKzEsNjcgQEAKKy8vQCBydW5EZWZhdWx0KCItLXVzZUJpZ0ludD10cnVl IiwgIi0tdXNlQ2xhc3NGaWVsZHM9dHJ1ZSIpCisKK2xldCBhc3NlcnQgPSB7CisgICAgc2FtZVZh bHVlKGEsIGUpIHsKKyAgICAgICAgaWYgKGEgIT09IGUpCisgICAgICAgICAgICB0aHJvdyBuZXcg RXJyb3IoIkV4cGVjdGVkOiAiICsgZSArICIgYnV0IGdvdDogIiArIGEpOworICAgIH0KK307CisK Ky8vIE9iamVjdCBMaXRlcmFsCisKK2xldCBvID0geyAxbjogImZvbyIgfTsKK2Fzc2VydC5zYW1l VmFsdWUob1sxbl0sICJmb28iKTsKK2Fzc2VydC5zYW1lVmFsdWUob1sxXSwgImZvbyIpOworYXNz ZXJ0LnNhbWVWYWx1ZShvWyIxIl0sICJmb28iKTsKKworLy8gTWV0aG9kRGVjbGFyYXRpb24KKwor byA9IHsgMW4oKSB7IHJldHVybiAiYmFyIjsgfSB9OworYXNzZXJ0LnNhbWVWYWx1ZShvWzFuXSgp LCAiYmFyIik7Cithc3NlcnQuc2FtZVZhbHVlKG9bMV0oKSwgImJhciIpOworYXNzZXJ0LnNhbWVW YWx1ZShvWyIxIl0oKSwgImJhciIpOworCitvID0geyBnZXQgMW4oKSB7IHJldHVybiAiYmFyIjsg fSB9OworYXNzZXJ0LnNhbWVWYWx1ZShvWzFuXSwgImJhciIpOworYXNzZXJ0LnNhbWVWYWx1ZShv WzFdLCAiYmFyIik7Cithc3NlcnQuc2FtZVZhbHVlKG9bIjEiXSwgImJhciIpOworCit7CisgICAg Y2xhc3MgQyB7CisgICAgICAgIDFuKCkgeyByZXR1cm4gImJheiI7IH0KKyAgICB9CisKKyAgICBs ZXQgYyA9IG5ldyBDKCk7CisgICAgYXNzZXJ0LnNhbWVWYWx1ZShjWzFuXSgpLCAiYmF6Iik7Cisg ICAgYXNzZXJ0LnNhbWVWYWx1ZShjWzFdKCksICJiYXoiKTsKKyAgICBhc3NlcnQuc2FtZVZhbHVl KGNbIjEiXSgpLCAiYmF6Iik7Cit9CisKK3sKKyAgICBjbGFzcyBDIHsKKyAgICAgICAgZ2V0IDFu KCkgeyByZXR1cm4gImJheiI7IH0KKyAgICB9CisKKyAgICBsZXQgYyA9IG5ldyBDKCk7CisgICAg YXNzZXJ0LnNhbWVWYWx1ZShjWzFuXSwgImJheiIpOworICAgIGFzc2VydC5zYW1lVmFsdWUoY1sx XSwgImJheiIpOworICAgIGFzc2VydC5zYW1lVmFsdWUoY1siMSJdLCAiYmF6Iik7Cit9CisKKy8v IEZpZWxkIGRlY2xhcmF0aW9uCit7CisgICAgY2xhc3MgQyB7CisgICAgICAgIDFuID0gImJheiI7 CisgICAgfQorCisgICAgbGV0IGMgPSBuZXcgQygpOworICAgIGFzc2VydC5zYW1lVmFsdWUoY1sx bl0sICJiYXoiKTsKKyAgICBhc3NlcnQuc2FtZVZhbHVlKGNbMV0sICJiYXoiKTsKKyAgICBhc3Nl cnQuc2FtZVZhbHVlKGNbIjEiXSwgImJheiIpOworfQorCisvLyBEZXN0cnVjdHVyaW5nCisKK2xl dCB7MW46IGF9ID0gezFuOiAiZm9vIn07Cithc3NlcnQuc2FtZVZhbHVlKGEsICJmb28iKTsKKwo= 390419 2020-02-11 14:02:00 -0800 2020-02-12 05:30:38 -0800 Patch bug-206888-20200211190157.patch text/plain 11601 ticaiolima U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2MzAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm YzI2YjJhZGYwNWQxYWY1ODlmMmExOGEwMmJmMjQ0ZGM0ZDE1MTM1Li42NTVhZGQ4YjdlNDU5MGVh M2VjNTJhMmYwZjY5NzdlODNmYTI4ZGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAyMC0wMi0xMSAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFpbC5jb20+ CisKKyAgICAgICAgW0VTTmV4dF1bQmlnSW50XSBXZSBkb24ndCBzdXBwb3J0IEJpZ0ludCBsaXRl cmFsIGFzIFByb3BlcnR5TmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA2ODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWNjb3JkaW5nIHRvIHNwZWMgKGh0dHBzOi8vdGMzOS5lcy9lY21hMjYyLyNw cm9kLVByb3BlcnR5TmFtZSksCisgICAgICAgIEJpZ0ludCBsaXRlcmFscyBhcmUgdmFsaWQgcHJv cGVydHkgbmFtZXMuIEdpdmVuIHRoYXQsIHdlIHNob3VsZCBub3QKKyAgICAgICAgdGhyb3cgYSBT eW50YXhFcnJvciB3aGVuIHVzaW5nIEJpZ0ludCBsaXRlcmFscyBvbiBkZXN0cnVjdHVyaW5nCisg ICAgICAgIHBhdHRlcm4sIG1ldGhvZCBkZWNsYXJhdGlvbiwgb2JqZWN0IGxpdGVyYWxzLCBldGMu CisgICAgICAgIFRoaXMgcGF0Y2ggaXMgYWRkaW5nIEJpZ0ludCBsaXRlcmFsIGFzIGEgdmFsaWQg c3ludGF4IHRvIFByb3BlcnR5TmFtZS4KKworICAgICAgICAqIHBhcnNlci9QYXJzZXIuY3BwOgor ICAgICAgICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VEZXN0cnVjdHVyaW5nUGF0dGVy bik6CisgICAgICAgIChKU0M6OlBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUNsYXNzKToKKyAgICAg ICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlSW5zdGFuY2VGaWVsZEluaXRpYWxpemVy U291cmNlRWxlbWVudHMpOgorICAgICAgICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VQ cm9wZXJ0eSk6CisgICAgICAgIChKU0M6OlBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUdldHRlclNl dHRlcik6CisgICAgICAgICogcGFyc2VyL1BhcnNlckFyZW5hLmNwcDoKKyAgICAgICAgKEpTQzo6 SWRlbnRpZmllckFyZW5hOjptYWtlQmlnSW50RGVjaW1hbElkZW50aWZpZXIpOgorICAgICAgICAq IHBhcnNlci9QYXJzZXJBcmVuYS5oOgorCiAyMDIwLTAyLTEwICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KIAogICAgICAgICBQbGFjYXRlIGV4Y2VwdGlvbiBjaGVjayB2YWxpZGF0b3Ig aW4gR2VuZXJpY0FyZ3VtZW50czxUeXBlPjo6cHV0KCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFy c2VyL1BhcnNlci5jcHAKaW5kZXggYzJmYTYwN2YyNzhmMjdjMzM1MWVkMTk4N2I4MzFlYTY5MjQy ZDk5Ni4uMmExOTFjODU2MGM0ZTg3MzgwMTNlZjM1YWVmZjJiY2M2N2VmYWQwZiAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcApAQCAtMTIyMiw2ICsxMjIyLDkgQEAgdGVt cGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlRGVzdHJ1Y3R1cmluZ1BhdHRlcm4gUGFyc2Vy PExleGVyVHlwZT46OnBhcnNlRGUKICAgICAgICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lID0g bV90b2tlbi5tX2RhdGEuaWRlbnQ7CiAgICAgICAgICAgICAgICAgICAgIHdhc1N0cmluZyA9IHRy dWU7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGNhc2UgQklH SU5UOgorICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eU5hbWUgPSAmbV9wYXJzZXJBcmVuYS5p ZGVudGlmaWVyQXJlbmEoKS5tYWtlQmlnSW50RGVjaW1hbElkZW50aWZpZXIoY29uc3RfY2FzdDxW TSY+KG1fdm0pLCAqbV90b2tlbi5tX2RhdGEuYmlnSW50U3RyaW5nLCBtX3Rva2VuLm1fZGF0YS5y YWRpeCk7CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIGNhc2Ug T1BFTkJSQUNLRVQ6CiAgICAgICAgICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAgICAgICAg ICAgICAgcHJvcGVydHlFeHByZXNzaW9uID0gcGFyc2VBc3NpZ25tZW50RXhwcmVzc2lvbihjb250 ZXh0KTsKQEAgLTI4OTIsNiArMjg5NSwxMSBAQCBwYXJzZU1ldGhvZDoKICAgICAgICAgICAgIEFT U0VSVChpZGVudCk7CiAgICAgICAgICAgICBuZXh0KCk7CiAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgY2FzZSBCSUdJTlQ6CisgICAgICAgICAgICBpZGVudCA9ICZtX3BhcnNlckFyZW5hLmlk ZW50aWZpZXJBcmVuYSgpLm1ha2VCaWdJbnREZWNpbWFsSWRlbnRpZmllcihjb25zdF9jYXN0PFZN Jj4obV92bSksICptX3Rva2VuLm1fZGF0YS5iaWdJbnRTdHJpbmcsIG1fdG9rZW4ubV9kYXRhLnJh ZGl4KTsKKyAgICAgICAgICAgIEFTU0VSVChpZGVudCk7CisgICAgICAgICAgICBuZXh0KCk7Cisg ICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBJREVOVDoKICAgICAgICAgICAgIGlmIChV TkxJS0VMWSgqbV90b2tlbi5tX2RhdGEuaWRlbnQgPT0gbV92bS5wcm9wZXJ0eU5hbWVzLT5hc3lu YyAmJiAhbV90b2tlbi5tX2RhdGEuZXNjYXBlZCkpIHsKICAgICAgICAgICAgICAgICBpZiAoIWlz R2VuZXJhdG9yTWV0aG9kUGFyc2VNb2RlKHBhcnNlTW9kZSkgJiYgIWlzQXN5bmNNZXRob2RQYXJz ZU1vZGUocGFyc2VNb2RlKSkgewpAQCAtMjkxMiw3ICsyOTIwLDcgQEAgcGFyc2VNZXRob2Q6CiAg ICAgICAgICAgICBpZGVudCA9IG1fdG9rZW4ubV9kYXRhLmlkZW50OwogICAgICAgICAgICAgQVNT RVJUKGlkZW50KTsKICAgICAgICAgICAgIG5leHQoKTsKLSAgICAgICAgICAgIGlmIChwYXJzZU1v ZGUgPT0gU291cmNlUGFyc2VNb2RlOjpNZXRob2RNb2RlICYmIChtYXRjaElkZW50aWZpZXJPcktl eXdvcmQoKSB8fCBtYXRjaChTVFJJTkcpIHx8IG1hdGNoKERPVUJMRSkgfHwgbWF0Y2goSU5URUdF UikgfHwgbWF0Y2goT1BFTkJSQUNLRVQpKSkgeworICAgICAgICAgICAgaWYgKHBhcnNlTW9kZSA9 PSBTb3VyY2VQYXJzZU1vZGU6Ok1ldGhvZE1vZGUgJiYgKG1hdGNoSWRlbnRpZmllck9yS2V5d29y ZCgpIHx8IG1hdGNoKFNUUklORykgfHwgbWF0Y2goRE9VQkxFKSB8fCBtYXRjaChJTlRFR0VSKSB8 fCBtYXRjaChCSUdJTlQpIHx8IG1hdGNoKE9QRU5CUkFDS0VUKSkpIHsKICAgICAgICAgICAgICAg ICBpc0dldHRlciA9ICppZGVudCA9PSBwcm9wZXJ0eU5hbWVzLmdldDsKICAgICAgICAgICAgICAg ICBpc1NldHRlciA9ICppZGVudCA9PSBwcm9wZXJ0eU5hbWVzLnNldDsKICAgICAgICAgICAgIH0K QEAgLTMwNDAsNiArMzA0OCwxMSBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVT b3VyY2VFbGVtZW50cyBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VJbnN0YW5jZQogICAgICAgICAg ICAgQVNTRVJUKGlkZW50KTsKICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAgICAgIGJyZWFr OworICAgICAgICBjYXNlIEJJR0lOVDoKKyAgICAgICAgICAgIGlkZW50ID0gJm1fcGFyc2VyQXJl bmEuaWRlbnRpZmllckFyZW5hKCkubWFrZUJpZ0ludERlY2ltYWxJZGVudGlmaWVyKGNvbnN0X2Nh c3Q8Vk0mPihtX3ZtKSwgKm1fdG9rZW4ubV9kYXRhLmJpZ0ludFN0cmluZywgbV90b2tlbi5tX2Rh dGEucmFkaXgpOworICAgICAgICAgICAgQVNTRVJUKGlkZW50KTsKKyAgICAgICAgICAgIG5leHQo KTsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIERPVUJMRToKICAgICAgICAgY2Fz ZSBJTlRFR0VSOgogICAgICAgICAgICAgaWRlbnQgPSAmbV9wYXJzZXJBcmVuYS5pZGVudGlmaWVy QXJlbmEoKS5tYWtlTnVtZXJpY0lkZW50aWZpZXIoY29uc3RfY2FzdDxWTSY+KG1fdm0pLCBtX3Rv a2VuLm1fZGF0YS5kb3VibGVWYWx1ZSk7CkBAIC00MTQ2LDYgKzQxNTksMjMgQEAgbmFtZWRQcm9w ZXJ0eToKICAgICAgICAgY29udGV4dC5zZXRFbmRPZmZzZXQobm9kZSwgbV9sZXhlci0+Y3VycmVu dE9mZnNldCgpKTsKICAgICAgICAgcmV0dXJuIGNvbnRleHQuY3JlYXRlUHJvcGVydHkoY29uc3Rf Y2FzdDxWTSY+KG1fdm0pLCBtX3BhcnNlckFyZW5hLCBwcm9wZXJ0eU5hbWUsIG5vZGUsIFByb3Bl cnR5Tm9kZTo6Q29uc3RhbnQsIFByb3BlcnR5Tm9kZTo6VW5rbm93biwgY29tcGxldGUsIFN1cGVy QmluZGluZzo6Tm90TmVlZGVkLCBDbGFzc0VsZW1lbnRUYWc6Ok5vKTsKICAgICB9CisgICAgY2Fz ZSBCSUdJTlQ6IHsKKyAgICAgICAgY29uc3QgSWRlbnRpZmllciogaWRlbnQgPSAmbV9wYXJzZXJB cmVuYS5pZGVudGlmaWVyQXJlbmEoKS5tYWtlQmlnSW50RGVjaW1hbElkZW50aWZpZXIoY29uc3Rf Y2FzdDxWTSY+KG1fdm0pLCAqbV90b2tlbi5tX2RhdGEuYmlnSW50U3RyaW5nLCBtX3Rva2VuLm1f ZGF0YS5yYWRpeCk7CisgICAgICAgIG5leHQoKTsKKworICAgICAgICBpZiAobWF0Y2goT1BFTlBB UkVOKSkgeworICAgICAgICAgICAgYXV0byBtZXRob2QgPSBwYXJzZVByb3BlcnR5TWV0aG9kKGNv bnRleHQsIGlkZW50LCBwYXJzZU1vZGUpOworICAgICAgICAgICAgcHJvcGFnYXRlRXJyb3IoKTsK KyAgICAgICAgICAgIHJldHVybiBjb250ZXh0LmNyZWF0ZVByb3BlcnR5KGlkZW50LCBtZXRob2Qs IFByb3BlcnR5Tm9kZTo6Q29uc3RhbnQsIFByb3BlcnR5Tm9kZTo6VW5rbm93biwgY29tcGxldGUs IFN1cGVyQmluZGluZzo6TmVlZGVkLCBJbmZlck5hbWU6OkFsbG93ZWQsIENsYXNzRWxlbWVudFRh Zzo6Tm8pOworICAgICAgICB9CisgICAgICAgIGZhaWxJZlRydWUocGFyc2VNb2RlICE9IFNvdXJj ZVBhcnNlTW9kZTo6TWV0aG9kTW9kZSwgIkV4cGVjdGVkIGEgcGFyZW50aGVzaXMgZm9yIGFyZ3Vt ZW50IGxpc3QiKTsKKworICAgICAgICBjb25zdW1lT3JGYWlsKENPTE9OLCAiRXhwZWN0ZWQgJzon IGFmdGVyIHByb3BlcnR5IG5hbWUiKTsKKyAgICAgICAgVHJlZUV4cHJlc3Npb24gbm9kZSA9IHBh cnNlQXNzaWdubWVudEV4cHJlc3Npb24oY29udGV4dCk7CisgICAgICAgIGZhaWxJZkZhbHNlKG5v ZGUsICJDYW5ub3QgcGFyc2UgZXhwcmVzc2lvbiBmb3IgcHJvcGVydHkgZGVjbGFyYXRpb24iKTsK KyAgICAgICAgY29udGV4dC5zZXRFbmRPZmZzZXQobm9kZSwgbV9sZXhlci0+Y3VycmVudE9mZnNl dCgpKTsKKyAgICAgICAgcmV0dXJuIGNvbnRleHQuY3JlYXRlUHJvcGVydHkoaWRlbnQsIG5vZGUs IFByb3BlcnR5Tm9kZTo6Q29uc3RhbnQsIFByb3BlcnR5Tm9kZTo6VW5rbm93biwgY29tcGxldGUs IFN1cGVyQmluZGluZzo6Tm90TmVlZGVkLCBJbmZlck5hbWU6OkFsbG93ZWQsIENsYXNzRWxlbWVu dFRhZzo6Tm8pOworICAgIH0KICAgICBjYXNlIE9QRU5CUkFDS0VUOiB7CiAgICAgICAgIG5leHQo KTsKICAgICAgICAgYXV0byBwcm9wZXJ0eU5hbWUgPSBwYXJzZUFzc2lnbm1lbnRFeHByZXNzaW9u KGNvbnRleHQpOwpAQCAtNDIxNCw2ICs0MjQ0LDkgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWls ZGVyPiBUcmVlUHJvcGVydHkgUGFyc2VyPExleGVyVHlwZT46OnBhcnNlR2V0dGVyU2V0dGVyKFQK ICAgICB9IGVsc2UgaWYgKG1hdGNoKERPVUJMRSkgfHwgbWF0Y2goSU5URUdFUikpIHsKICAgICAg ICAgbnVtZXJpY1Byb3BlcnR5TmFtZSA9IG1fdG9rZW4ubV9kYXRhLmRvdWJsZVZhbHVlOwogICAg ICAgICBuZXh0KCk7CisgICAgfSBlbHNlIGlmIChtYXRjaChCSUdJTlQpKSB7CisgICAgICAgIHN0 cmluZ1Byb3BlcnR5TmFtZSA9ICZtX3BhcnNlckFyZW5hLmlkZW50aWZpZXJBcmVuYSgpLm1ha2VC aWdJbnREZWNpbWFsSWRlbnRpZmllcihjb25zdF9jYXN0PFZNJj4obV92bSksICptX3Rva2VuLm1f ZGF0YS5iaWdJbnRTdHJpbmcsIG1fdG9rZW4ubV9kYXRhLnJhZGl4KTsKKyAgICAgICAgbmV4dCgp OwogICAgIH0gZWxzZSBpZiAobWF0Y2goT1BFTkJSQUNLRVQpKSB7CiAgICAgICAgIG5leHQoKTsK ICAgICAgICAgY29tcHV0ZWRQcm9wZXJ0eU5hbWUgPSBwYXJzZUFzc2lnbm1lbnRFeHByZXNzaW9u KGNvbnRleHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJz ZXJBcmVuYS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlckFyZW5hLmNw cAppbmRleCAyNmJlMDQxMGNhYjQwNzZmZjVlZDcxNTBiMThmMGRmN2QwMjkxMDIwLi4wODY5YmIy MTcyM2JlNTAxMjNhNWRlNmMzZjRjZjhjZWQ5NTIxMjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlckFyZW5hLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcGFyc2VyL1BhcnNlckFyZW5hLmNwcApAQCAtMjYsNiArMjYsOCBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIlBhcnNlckFyZW5hLmgiCiAKKyNpbmNsdWRlICJDYXRjaFNj b3BlLmgiCisjaW5jbHVkZSAiSlNCaWdJbnQuaCIKICNpbmNsdWRlICJOb2Rlcy5oIgogI2luY2x1 ZGUgIkpTQ0lubGluZXMuaCIKIApAQCAtNzYsNCArNzgsMjIgQEAgdm9pZCBQYXJzZXJBcmVuYTo6 YWxsb2NhdGVGcmVlYWJsZVBvb2woKQogICAgIEFTU0VSVChmcmVlYWJsZVBvb2woKSA9PSBwb29s KTsKIH0KIAorY29uc3QgSWRlbnRpZmllciYgSWRlbnRpZmllckFyZW5hOjptYWtlQmlnSW50RGVj aW1hbElkZW50aWZpZXIoVk0mIHZtLCBjb25zdCBJZGVudGlmaWVyJiBpZGVudGlmaWVyLCB1aW50 OF90IHJhZGl4KQoreworICAgIGlmIChyYWRpeCA9PSAxMCkKKyAgICAgICAgcmV0dXJuIGlkZW50 aWZpZXI7CisKKyAgICAvLyBGSVhNRTogV2UgYXJlIGFsbG9jYXRpbmcgYSBKU0JpZ0ludCBqdXN0 IHRvIGJlIGFibGUgdG8gdXNlCisgICAgLy8gSlNCaWdJbnQ6OnRyeUdldFN0cmluZyB3aGVuIHJh ZGl4IGlzIG5vdCAxMC4KKyAgICAvLyBUaGlzIGNyZWF0ZXMgc29tZSBHQyBwcmVzc3VyZSwgYnV0 IHNpbmNlIHRoZXNlIGlkZW50aWZpZXJzCisgICAgLy8gd2lsbCBvbmx5IGJlIGNyZWF0ZWQgd2hl biBCaWdJbnQgbGl0ZXJhbCBpcyB1c2VkIGFzIGEgcHJvcGVydHkgbmFtZSwKKyAgICAvLyBpdCB3 b250IGJlIG11Y2ggcHJvYmxlbWF0aWMsIGdpdmVuIHN1Y2ggY2FzZXMgYXJlIHZlcnkgcmFyZS4K KworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX0NBVENIX1NDT1BFKHZtKTsKKyAgICBKU0JpZ0lu dCogYmlnSW50ID0gSlNCaWdJbnQ6OnBhcnNlSW50KG51bGxwdHIsIHZtLCBpZGVudGlmaWVyLnN0 cmluZygpLCByYWRpeCwgSlNCaWdJbnQ6OkVycm9yUGFyc2VNb2RlOjpUaHJvd0V4Y2VwdGlvbnMs IEpTQmlnSW50OjpQYXJzZUludFNpZ246OlVuc2lnbmVkKTsKKyAgICBzY29wZS5hc3NlcnROb0V4 Y2VwdGlvbigpOworICAgIG1faWRlbnRpZmllcnMuYXBwZW5kKElkZW50aWZpZXI6OmZyb21TdHJp bmcodm0sIEpTQmlnSW50Ojp0cnlHZXRTdHJpbmcodm0sIGJpZ0ludCwgMTApKSk7CisgICAgcmV0 dXJuIG1faWRlbnRpZmllcnMubGFzdCgpOworfQorCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlckFyZW5hLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cGFyc2VyL1BhcnNlckFyZW5hLmgKaW5kZXggMzZkYmJkNGE1NjRiMjNjOTQ2ODFlMzlhY2E0Nzg2 N2Y4ZWMyMGYxOC4uNGQ5YzE5ZDBjZGI3MTdmNmI2MzI2MDA5OWZlZjZmOGE3MTE1YThlZiAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXJBcmVuYS5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyQXJlbmEuaApAQCAtNTAsNiArNTAs NyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgQUxXQVlTX0lOTElORSBjb25zdCBJZGVudGlm aWVyJiBtYWtlSWRlbnRpZmllckxDaGFyRnJvbVVDaGFyKFZNJiwgY29uc3QgVUNoYXIqIGNoYXJh Y3RlcnMsIHNpemVfdCBsZW5ndGgpOwogICAgICAgICBBTFdBWVNfSU5MSU5FIGNvbnN0IElkZW50 aWZpZXImIG1ha2VJZGVudGlmaWVyKFZNJiwgU3ltYm9sSW1wbCopOwogCisgICAgICAgIGNvbnN0 IElkZW50aWZpZXImIG1ha2VCaWdJbnREZWNpbWFsSWRlbnRpZmllcihWTSYsIGNvbnN0IElkZW50 aWZpZXImLCB1aW50OF90IHJhZGl4KTsKICAgICAgICAgY29uc3QgSWRlbnRpZmllciYgbWFrZU51 bWVyaWNJZGVudGlmaWVyKFZNJiwgZG91YmxlIG51bWJlcik7CiAKICAgICBwdWJsaWM6CmRpZmYg LS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGY5ZTEx YmQ0NzliYTE1MDQ3NDhmNTgzYmE2ZmEzMTI1ZTM3ODQ1MzEuLjM1ODMxYTRkZjgxNzY3MTY5YzI1 NzVmYmMzZWRkN2JmMmE1MWJhOGQgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBi L0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDItMTEgIENhaW8gTGlt YSAgPHRpY2Fpb2xpbWFAZ21haWwuY29tPgorCisgICAgICAgIFtFU05leHRdW0JpZ0ludF0gV2Ug ZG9uJ3Qgc3VwcG9ydCBCaWdJbnQgbGl0ZXJhbCBhcyBQcm9wZXJ0eU5hbWUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjg4OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3RyZXNzL2JpZy1pbnQtYXMt cHJvcGVydHktbmFtZS5qczogQWRkZWQuCisKIDIwMjAtMDItMTAgIE1hcmsgTGFtICA8bWFyay5s YW1AYXBwbGUuY29tPgogCiAgICAgICAgIFBsYWNhdGUgZXhjZXB0aW9uIGNoZWNrIHZhbGlkYXRv ciBpbiBHZW5lcmljQXJndW1lbnRzPFR5cGU+OjpwdXQoKS4KZGlmZiAtLWdpdCBhL0pTVGVzdHMv c3RyZXNzL2JpZy1pbnQtYXMtcHJvcGVydHktbmFtZS5qcyBiL0pTVGVzdHMvc3RyZXNzL2JpZy1p bnQtYXMtcHJvcGVydHktbmFtZS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMWU0Y2FmZDhiMWExYWNlZDU0MDRm N2U1ZjY4OTFkOTc5OTg1ZGNjCi0tLSAvZGV2L251bGwKKysrIGIvSlNUZXN0cy9zdHJlc3MvYmln LWludC1hcy1wcm9wZXJ0eS1uYW1lLmpzCkBAIC0wLDAgKzEsOTQgQEAKKy8vQCBydW5EZWZhdWx0 KCItLXVzZUJpZ0ludD10cnVlIiwgIi0tdXNlQ2xhc3NGaWVsZHM9dHJ1ZSIpCisKK2xldCBhc3Nl cnQgPSB7CisgICAgc2FtZVZhbHVlKGEsIGUpIHsKKyAgICAgICAgaWYgKGEgIT09IGUpCisgICAg ICAgICAgICB0aHJvdyBuZXcgRXJyb3IoIkV4cGVjdGVkOiAiICsgZSArICIgYnV0IGdvdDogIiAr IGEpOworICAgIH0sCisgICAgc2FtZUFycmF5KGEsIGUpIHsKKyAgICAgICAgaWYgKGEubGVuZ3Ro ICE9IGUubGVuZ3RoKQorICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJHb3QgYXJyYXk6ICIg KyBhICsgIiBidXQgZXhwZWN0ZWQ6ICIgKyBlKTsKKworICAgICAgICBmb3IgKGxldCBpID0gMDsg aSA8IGEubGVuZ3RoOyBpKyspIHsKKyAgICAgICAgICAgIGlmIChhW2ldICE9PSBlW2ldKQorICAg ICAgICAgICAgICAgIHRocm93IG5ldyBFcnJvcigiR290IGFycmF5OiAiICsgYSArICIgYnV0IGV4 cGVjdGVkOiAiICsgZSk7CisgICAgICAgIH0KKyAgICB9Cit9OworCisvLyBPYmplY3QgTGl0ZXJh bAorCitsZXQgbyA9IHsKKyAgICAzMG46ICIzMCIsCisgICAgMG8xbjogIjEiLAorICAgIDBiMTBu OiAiMiIsCisgICAgMHhhbjogIjEwIiwKKyAgICAxXzJfM246ICIxXzJfMyIKK307Cithc3NlcnQu c2FtZVZhbHVlKG9bIjEiXSwgIjEiKTsKK2Fzc2VydC5zYW1lVmFsdWUob1siMiJdLCAiMiIpOwor YXNzZXJ0LnNhbWVWYWx1ZShvWyIxMCJdLCAiMTAiKTsKK2Fzc2VydC5zYW1lVmFsdWUob1siMTIz Il0sICIxXzJfMyIpOworCisvLyBNZXRob2REZWNsYXJhdGlvbgorCitvID0geworICAwYjFuKCkg e30sCisgICowbzJuKCkge30sCisgIGFzeW5jIDB4M24oKSB7fSwKKyAgYXN5bmMqIDRuKCkge30s CisgIGdldCA1bigpIHt9LAorICBzZXQgNm4oeCkge30sCisgIDduOiBmdW5jdGlvbiAoKSB7fQor fTsKKworYXNzZXJ0LnNhbWVBcnJheShPYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcyhvKSwgWyIx IiwgIjIiLCAiMyIsICI0IiwgIjUiLCAiNiIsICI3Il0pOworCithc3NlcnQuc2FtZVZhbHVlKG9b MV0ubmFtZSwgIjEiKTsKK2Fzc2VydC5zYW1lVmFsdWUob1syXS5uYW1lLCAiMiIpOworYXNzZXJ0 LnNhbWVWYWx1ZShvWzNdLm5hbWUsICIzIik7Cithc3NlcnQuc2FtZVZhbHVlKG9bNF0ubmFtZSwg IjQiKTsKK2Fzc2VydC5zYW1lVmFsdWUoT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvcihv LCA1KS5nZXQubmFtZSwgImdldCA1Iik7Cithc3NlcnQuc2FtZVZhbHVlKE9iamVjdC5nZXRPd25Q cm9wZXJ0eURlc2NyaXB0b3IobywgNikuc2V0Lm5hbWUsICJzZXQgNiIpOworYXNzZXJ0LnNhbWVW YWx1ZShvWzddLm5hbWUsICI3Iik7CisKK3sKKyAgICBjbGFzcyBDIHsKKyAgICAgICAgMGIxbigp IHt9OworICAgICAgICAqMG8ybigpIHt9OworICAgICAgICBhc3luYyAweDNuKCkge307CisgICAg ICAgIGFzeW5jKiA0bigpIHt9OworICAgICAgICBnZXQgNW4oKSB7fTsKKyAgICAgICAgc2V0IDZu KHgpIHt9OworICAgIH0KKworICAgIGxldCBjID0gQy5wcm90b3R5cGU7CisgICAgYXNzZXJ0LnNh bWVBcnJheShPYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcyhjKSwgWyIxIiwgIjIiLCAiMyIsICI0 IiwgIjUiLCAiNiIsICJjb25zdHJ1Y3RvciJdKTsKKyAgICBhc3NlcnQuc2FtZVZhbHVlKGNbMV0u bmFtZSwgIjEiKTsKKyAgICBhc3NlcnQuc2FtZVZhbHVlKGNbMl0ubmFtZSwgIjIiKTsKKyAgICBh c3NlcnQuc2FtZVZhbHVlKGNbM10ubmFtZSwgIjMiKTsKKyAgICBhc3NlcnQuc2FtZVZhbHVlKGNb NF0ubmFtZSwgIjQiKTsKKyAgICBhc3NlcnQuc2FtZVZhbHVlKE9iamVjdC5nZXRPd25Qcm9wZXJ0 eURlc2NyaXB0b3IoYywgNSkuZ2V0Lm5hbWUsICJnZXQgNSIpOworICAgIGFzc2VydC5zYW1lVmFs dWUoT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvcihjLCA2KS5zZXQubmFtZSwgInNldCA2 Iik7Cit9CisKKy8vIEZpZWxkIGRlY2xhcmF0aW9uCit7CisgICAgY2xhc3MgQyB7CisgICAgICAg IDBvMW4gPSAiYmF6IjsKKyAgICAgICAgMGIxMG4gPSBmdW5jdGlvbiAoKSB7fTsKKyAgICB9CisK KyAgICBsZXQgYyA9IG5ldyBDKCk7CisgICAgYXNzZXJ0LnNhbWVWYWx1ZShjWzFuXSwgImJheiIp OworICAgIGFzc2VydC5zYW1lVmFsdWUoY1sxXSwgImJheiIpOworICAgIGFzc2VydC5zYW1lVmFs dWUoY1siMSJdLCAiYmF6Iik7CisKKyAgICBhc3NlcnQuc2FtZVZhbHVlKGNbMl0ubmFtZSwgIjIi KTsKK30KKworLy8gRGVzdHJ1Y3R1cmluZworCitsZXQgezFuOiBhfSA9IHsxbjogImZvbyJ9Owor YXNzZXJ0LnNhbWVWYWx1ZShhLCAiZm9vIik7CisK 390507 2020-02-12 05:30:44 -0800 2020-02-13 13:59:16 -0800 Patch bug-206888-20200212103042.patch text/plain 11728 ticaiolima U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2MzAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm YzI2YjJhZGYwNWQxYWY1ODlmMmExOGEwMmJmMjQ0ZGM0ZDE1MTM1Li5lOWM0ZGI4NmJmNzg0ZjEy ZGQwNjAxYzk0MmU5NDU2YjFmODIzYzk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAyMC0wMi0xMSAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFpbC5jb20+ CisKKyAgICAgICAgW0VTTmV4dF1bQmlnSW50XSBXZSBkb24ndCBzdXBwb3J0IEJpZ0ludCBsaXRl cmFsIGFzIFByb3BlcnR5TmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA2ODg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUm9zcyBLaXJzbGluZy4K KworICAgICAgICBBY2NvcmRpbmcgdG8gc3BlYyAoaHR0cHM6Ly90YzM5LmVzL2VjbWEyNjIvI3By b2QtUHJvcGVydHlOYW1lKSwKKyAgICAgICAgQmlnSW50IGxpdGVyYWxzIGFyZSB2YWxpZCBwcm9w ZXJ0eSBuYW1lcy4gR2l2ZW4gdGhhdCwgd2Ugc2hvdWxkIG5vdAorICAgICAgICB0aHJvdyBhIFN5 bnRheEVycm9yIHdoZW4gdXNpbmcgQmlnSW50IGxpdGVyYWxzIG9uIGRlc3RydWN0dXJpbmcKKyAg ICAgICAgcGF0dGVybiwgbWV0aG9kIGRlY2xhcmF0aW9uLCBvYmplY3QgbGl0ZXJhbHMsIGV0Yy4K KyAgICAgICAgVGhpcyBwYXRjaCBpcyBhZGRpbmcgQmlnSW50IGxpdGVyYWwgYXMgYSB2YWxpZCBz eW50YXggdG8gUHJvcGVydHlOYW1lLgorCisgICAgICAgICogcGFyc2VyL1BhcnNlci5jcHA6Cisg ICAgICAgIChKU0M6OlBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZURlc3RydWN0dXJpbmdQYXR0ZXJu KToKKyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlQ2xhc3MpOgorICAgICAg ICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VJbnN0YW5jZUZpZWxkSW5pdGlhbGl6ZXJT b3VyY2VFbGVtZW50cyk6CisgICAgICAgIChKU0M6OlBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZVBy b3BlcnR5KToKKyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlR2V0dGVyU2V0 dGVyKToKKyAgICAgICAgKiBwYXJzZXIvUGFyc2VyQXJlbmEuY3BwOgorICAgICAgICAoSlNDOjpJ ZGVudGlmaWVyQXJlbmE6Om1ha2VCaWdJbnREZWNpbWFsSWRlbnRpZmllcik6CisgICAgICAgICog cGFyc2VyL1BhcnNlckFyZW5hLmg6CisKIDIwMjAtMDItMTAgIE1hcmsgTGFtICA8bWFyay5sYW1A YXBwbGUuY29tPgogCiAgICAgICAgIFBsYWNhdGUgZXhjZXB0aW9uIGNoZWNrIHZhbGlkYXRvciBp biBHZW5lcmljQXJndW1lbnRzPFR5cGU+OjpwdXQoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJz ZXIvUGFyc2VyLmNwcAppbmRleCBjMmZhNjA3ZjI3OGYyN2MzMzUxZWQxOTg3YjgzMWVhNjkyNDJk OTk2Li4yYTE5MWM4NTYwYzRlODczODAxM2VmMzVhZWZmMmJjYzY3ZWZhZDBmIDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCkBAIC0xMjIyLDYgKzEyMjIsOSBAQCB0ZW1w bGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVEZXN0cnVjdHVyaW5nUGF0dGVybiBQYXJzZXI8 TGV4ZXJUeXBlPjo6cGFyc2VEZQogICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eU5hbWUgPSBt X3Rva2VuLm1fZGF0YS5pZGVudDsKICAgICAgICAgICAgICAgICAgICAgd2FzU3RyaW5nID0gdHJ1 ZTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgY2FzZSBCSUdJ TlQ6CisgICAgICAgICAgICAgICAgICAgIHByb3BlcnR5TmFtZSA9ICZtX3BhcnNlckFyZW5hLmlk ZW50aWZpZXJBcmVuYSgpLm1ha2VCaWdJbnREZWNpbWFsSWRlbnRpZmllcihjb25zdF9jYXN0PFZN Jj4obV92bSksICptX3Rva2VuLm1fZGF0YS5iaWdJbnRTdHJpbmcsIG1fdG9rZW4ubV9kYXRhLnJh ZGl4KTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgY2FzZSBP UEVOQlJBQ0tFVDoKICAgICAgICAgICAgICAgICAgICAgbmV4dCgpOwogICAgICAgICAgICAgICAg ICAgICBwcm9wZXJ0eUV4cHJlc3Npb24gPSBwYXJzZUFzc2lnbm1lbnRFeHByZXNzaW9uKGNvbnRl eHQpOwpAQCAtMjg5Miw2ICsyODk1LDExIEBAIHBhcnNlTWV0aG9kOgogICAgICAgICAgICAgQVNT RVJUKGlkZW50KTsKICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICBjYXNlIEJJR0lOVDoKKyAgICAgICAgICAgIGlkZW50ID0gJm1fcGFyc2VyQXJlbmEuaWRl bnRpZmllckFyZW5hKCkubWFrZUJpZ0ludERlY2ltYWxJZGVudGlmaWVyKGNvbnN0X2Nhc3Q8Vk0m PihtX3ZtKSwgKm1fdG9rZW4ubV9kYXRhLmJpZ0ludFN0cmluZywgbV90b2tlbi5tX2RhdGEucmFk aXgpOworICAgICAgICAgICAgQVNTRVJUKGlkZW50KTsKKyAgICAgICAgICAgIG5leHQoKTsKKyAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIElERU5UOgogICAgICAgICAgICAgaWYgKFVO TElLRUxZKCptX3Rva2VuLm1fZGF0YS5pZGVudCA9PSBtX3ZtLnByb3BlcnR5TmFtZXMtPmFzeW5j ICYmICFtX3Rva2VuLm1fZGF0YS5lc2NhcGVkKSkgewogICAgICAgICAgICAgICAgIGlmICghaXNH ZW5lcmF0b3JNZXRob2RQYXJzZU1vZGUocGFyc2VNb2RlKSAmJiAhaXNBc3luY01ldGhvZFBhcnNl TW9kZShwYXJzZU1vZGUpKSB7CkBAIC0yOTEyLDcgKzI5MjAsNyBAQCBwYXJzZU1ldGhvZDoKICAg ICAgICAgICAgIGlkZW50ID0gbV90b2tlbi5tX2RhdGEuaWRlbnQ7CiAgICAgICAgICAgICBBU1NF UlQoaWRlbnQpOwogICAgICAgICAgICAgbmV4dCgpOwotICAgICAgICAgICAgaWYgKHBhcnNlTW9k ZSA9PSBTb3VyY2VQYXJzZU1vZGU6Ok1ldGhvZE1vZGUgJiYgKG1hdGNoSWRlbnRpZmllck9yS2V5 d29yZCgpIHx8IG1hdGNoKFNUUklORykgfHwgbWF0Y2goRE9VQkxFKSB8fCBtYXRjaChJTlRFR0VS KSB8fCBtYXRjaChPUEVOQlJBQ0tFVCkpKSB7CisgICAgICAgICAgICBpZiAocGFyc2VNb2RlID09 IFNvdXJjZVBhcnNlTW9kZTo6TWV0aG9kTW9kZSAmJiAobWF0Y2hJZGVudGlmaWVyT3JLZXl3b3Jk KCkgfHwgbWF0Y2goU1RSSU5HKSB8fCBtYXRjaChET1VCTEUpIHx8IG1hdGNoKElOVEVHRVIpIHx8 IG1hdGNoKEJJR0lOVCkgfHwgbWF0Y2goT1BFTkJSQUNLRVQpKSkgewogICAgICAgICAgICAgICAg IGlzR2V0dGVyID0gKmlkZW50ID09IHByb3BlcnR5TmFtZXMuZ2V0OwogICAgICAgICAgICAgICAg IGlzU2V0dGVyID0gKmlkZW50ID09IHByb3BlcnR5TmFtZXMuc2V0OwogICAgICAgICAgICAgfQpA QCAtMzA0MCw2ICszMDQ4LDExIEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZVNv dXJjZUVsZW1lbnRzIFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUluc3RhbmNlCiAgICAgICAgICAg ICBBU1NFUlQoaWRlbnQpOwogICAgICAgICAgICAgbmV4dCgpOwogICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIGNhc2UgQklHSU5UOgorICAgICAgICAgICAgaWRlbnQgPSAmbV9wYXJzZXJBcmVu YS5pZGVudGlmaWVyQXJlbmEoKS5tYWtlQmlnSW50RGVjaW1hbElkZW50aWZpZXIoY29uc3RfY2Fz dDxWTSY+KG1fdm0pLCAqbV90b2tlbi5tX2RhdGEuYmlnSW50U3RyaW5nLCBtX3Rva2VuLm1fZGF0 YS5yYWRpeCk7CisgICAgICAgICAgICBBU1NFUlQoaWRlbnQpOworICAgICAgICAgICAgbmV4dCgp OworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRE9VQkxFOgogICAgICAgICBjYXNl IElOVEVHRVI6CiAgICAgICAgICAgICBpZGVudCA9ICZtX3BhcnNlckFyZW5hLmlkZW50aWZpZXJB cmVuYSgpLm1ha2VOdW1lcmljSWRlbnRpZmllcihjb25zdF9jYXN0PFZNJj4obV92bSksIG1fdG9r ZW4ubV9kYXRhLmRvdWJsZVZhbHVlKTsKQEAgLTQxNDYsNiArNDE1OSwyMyBAQCBuYW1lZFByb3Bl cnR5OgogICAgICAgICBjb250ZXh0LnNldEVuZE9mZnNldChub2RlLCBtX2xleGVyLT5jdXJyZW50 T2Zmc2V0KCkpOwogICAgICAgICByZXR1cm4gY29udGV4dC5jcmVhdGVQcm9wZXJ0eShjb25zdF9j YXN0PFZNJj4obV92bSksIG1fcGFyc2VyQXJlbmEsIHByb3BlcnR5TmFtZSwgbm9kZSwgUHJvcGVy dHlOb2RlOjpDb25zdGFudCwgUHJvcGVydHlOb2RlOjpVbmtub3duLCBjb21wbGV0ZSwgU3VwZXJC aW5kaW5nOjpOb3ROZWVkZWQsIENsYXNzRWxlbWVudFRhZzo6Tm8pOwogICAgIH0KKyAgICBjYXNl IEJJR0lOVDogeworICAgICAgICBjb25zdCBJZGVudGlmaWVyKiBpZGVudCA9ICZtX3BhcnNlckFy ZW5hLmlkZW50aWZpZXJBcmVuYSgpLm1ha2VCaWdJbnREZWNpbWFsSWRlbnRpZmllcihjb25zdF9j YXN0PFZNJj4obV92bSksICptX3Rva2VuLm1fZGF0YS5iaWdJbnRTdHJpbmcsIG1fdG9rZW4ubV9k YXRhLnJhZGl4KTsKKyAgICAgICAgbmV4dCgpOworCisgICAgICAgIGlmIChtYXRjaChPUEVOUEFS RU4pKSB7CisgICAgICAgICAgICBhdXRvIG1ldGhvZCA9IHBhcnNlUHJvcGVydHlNZXRob2QoY29u dGV4dCwgaWRlbnQsIHBhcnNlTW9kZSk7CisgICAgICAgICAgICBwcm9wYWdhdGVFcnJvcigpOwor ICAgICAgICAgICAgcmV0dXJuIGNvbnRleHQuY3JlYXRlUHJvcGVydHkoaWRlbnQsIG1ldGhvZCwg UHJvcGVydHlOb2RlOjpDb25zdGFudCwgUHJvcGVydHlOb2RlOjpVbmtub3duLCBjb21wbGV0ZSwg U3VwZXJCaW5kaW5nOjpOZWVkZWQsIEluZmVyTmFtZTo6QWxsb3dlZCwgQ2xhc3NFbGVtZW50VGFn OjpObyk7CisgICAgICAgIH0KKyAgICAgICAgZmFpbElmVHJ1ZShwYXJzZU1vZGUgIT0gU291cmNl UGFyc2VNb2RlOjpNZXRob2RNb2RlLCAiRXhwZWN0ZWQgYSBwYXJlbnRoZXNpcyBmb3IgYXJndW1l bnQgbGlzdCIpOworCisgICAgICAgIGNvbnN1bWVPckZhaWwoQ09MT04sICJFeHBlY3RlZCAnOicg YWZ0ZXIgcHJvcGVydHkgbmFtZSIpOworICAgICAgICBUcmVlRXhwcmVzc2lvbiBub2RlID0gcGFy c2VBc3NpZ25tZW50RXhwcmVzc2lvbihjb250ZXh0KTsKKyAgICAgICAgZmFpbElmRmFsc2Uobm9k ZSwgIkNhbm5vdCBwYXJzZSBleHByZXNzaW9uIGZvciBwcm9wZXJ0eSBkZWNsYXJhdGlvbiIpOwor ICAgICAgICBjb250ZXh0LnNldEVuZE9mZnNldChub2RlLCBtX2xleGVyLT5jdXJyZW50T2Zmc2V0 KCkpOworICAgICAgICByZXR1cm4gY29udGV4dC5jcmVhdGVQcm9wZXJ0eShpZGVudCwgbm9kZSwg UHJvcGVydHlOb2RlOjpDb25zdGFudCwgUHJvcGVydHlOb2RlOjpVbmtub3duLCBjb21wbGV0ZSwg U3VwZXJCaW5kaW5nOjpOb3ROZWVkZWQsIEluZmVyTmFtZTo6QWxsb3dlZCwgQ2xhc3NFbGVtZW50 VGFnOjpObyk7CisgICAgfQogICAgIGNhc2UgT1BFTkJSQUNLRVQ6IHsKICAgICAgICAgbmV4dCgp OwogICAgICAgICBhdXRvIHByb3BlcnR5TmFtZSA9IHBhcnNlQXNzaWdubWVudEV4cHJlc3Npb24o Y29udGV4dCk7CkBAIC00MjE0LDYgKzQyNDQsOSBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxk ZXI+IFRyZWVQcm9wZXJ0eSBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VHZXR0ZXJTZXR0ZXIoVAog ICAgIH0gZWxzZSBpZiAobWF0Y2goRE9VQkxFKSB8fCBtYXRjaChJTlRFR0VSKSkgewogICAgICAg ICBudW1lcmljUHJvcGVydHlOYW1lID0gbV90b2tlbi5tX2RhdGEuZG91YmxlVmFsdWU7CiAgICAg ICAgIG5leHQoKTsKKyAgICB9IGVsc2UgaWYgKG1hdGNoKEJJR0lOVCkpIHsKKyAgICAgICAgc3Ry aW5nUHJvcGVydHlOYW1lID0gJm1fcGFyc2VyQXJlbmEuaWRlbnRpZmllckFyZW5hKCkubWFrZUJp Z0ludERlY2ltYWxJZGVudGlmaWVyKGNvbnN0X2Nhc3Q8Vk0mPihtX3ZtKSwgKm1fdG9rZW4ubV9k YXRhLmJpZ0ludFN0cmluZywgbV90b2tlbi5tX2RhdGEucmFkaXgpOworICAgICAgICBuZXh0KCk7 CiAgICAgfSBlbHNlIGlmIChtYXRjaChPUEVOQlJBQ0tFVCkpIHsKICAgICAgICAgbmV4dCgpOwog ICAgICAgICBjb21wdXRlZFByb3BlcnR5TmFtZSA9IHBhcnNlQXNzaWdubWVudEV4cHJlc3Npb24o Y29udGV4dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNl ckFyZW5hLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyQXJlbmEuY3Bw CmluZGV4IDI2YmUwNDEwY2FiNDA3NmZmNWVkNzE1MGIxOGYwZGY3ZDAyOTEwMjAuLjg0ZmUzOTlj ZDhjZTJjOWVjNzczYjQ2N2I4MWIzMTcyZDllN2I4Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyQXJlbmEuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9wYXJzZXIvUGFyc2VyQXJlbmEuY3BwCkBAIC0yNiw2ICsyNiw4IEBACiAjaW5jbHVkZSAi Y29uZmlnLmgiCiAjaW5jbHVkZSAiUGFyc2VyQXJlbmEuaCIKIAorI2luY2x1ZGUgIkNhdGNoU2Nv cGUuaCIKKyNpbmNsdWRlICJKU0JpZ0ludC5oIgogI2luY2x1ZGUgIk5vZGVzLmgiCiAjaW5jbHVk ZSAiSlNDSW5saW5lcy5oIgogCkBAIC03Niw0ICs3OCwyNCBAQCB2b2lkIFBhcnNlckFyZW5hOjph bGxvY2F0ZUZyZWVhYmxlUG9vbCgpCiAgICAgQVNTRVJUKGZyZWVhYmxlUG9vbCgpID09IHBvb2wp OwogfQogCitjb25zdCBJZGVudGlmaWVyJiBJZGVudGlmaWVyQXJlbmE6Om1ha2VCaWdJbnREZWNp bWFsSWRlbnRpZmllcihWTSYgdm0sIGNvbnN0IElkZW50aWZpZXImIGlkZW50aWZpZXIsIHVpbnQ4 X3QgcmFkaXgpCit7CisgICAgaWYgKHJhZGl4ID09IDEwKQorICAgICAgICByZXR1cm4gaWRlbnRp ZmllcjsKKworICAgIC8vIEZJWE1FOiBXZSBhcmUgYWxsb2NhdGluZyBhIEpTQmlnSW50IGp1c3Qg dG8gYmUgYWJsZSB0byB1c2UKKyAgICAvLyBKU0JpZ0ludDo6dHJ5R2V0U3RyaW5nIHdoZW4gcmFk aXggaXMgbm90IDEwLgorICAgIC8vIFRoaXMgY3JlYXRlcyBzb21lIEdDIHByZXNzdXJlLCBidXQg c2luY2UgdGhlc2UgaWRlbnRpZmllcnMKKyAgICAvLyB3aWxsIG9ubHkgYmUgY3JlYXRlZCB3aGVu IEJpZ0ludCBsaXRlcmFsIGlzIHVzZWQgYXMgYSBwcm9wZXJ0eSBuYW1lLAorICAgIC8vIGl0IHdv bnQgYmUgbXVjaCBwcm9ibGVtYXRpYywgZ2l2ZW4gc3VjaCBjYXNlcyBhcmUgdmVyeSByYXJlLgor ICAgIC8vIFRoZXJlIGlzIGEgbG90IG9mIG9wdGltaXphdGlvbnMgd2UgY2FuIGFwcGx5IGhlcmUg d2hlbiBuZWNlc3NhcnkuCisgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNzYyNworCisgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfQ0FUQ0hfU0NPUEUodm0p OworICAgIEpTQmlnSW50KiBiaWdJbnQgPSBKU0JpZ0ludDo6cGFyc2VJbnQobnVsbHB0ciwgdm0s IGlkZW50aWZpZXIuc3RyaW5nKCksIHJhZGl4LCBKU0JpZ0ludDo6RXJyb3JQYXJzZU1vZGU6OlRo cm93RXhjZXB0aW9ucywgSlNCaWdJbnQ6OlBhcnNlSW50U2lnbjo6VW5zaWduZWQpOworICAgIHNj b3BlLmFzc2VydE5vRXhjZXB0aW9uKCk7CisgICAgbV9pZGVudGlmaWVycy5hcHBlbmQoSWRlbnRp Zmllcjo6ZnJvbVN0cmluZyh2bSwgSlNCaWdJbnQ6OnRyeUdldFN0cmluZyh2bSwgYmlnSW50LCAx MCkpKTsKKyAgICByZXR1cm4gbV9pZGVudGlmaWVycy5sYXN0KCk7Cit9CisKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyQXJlbmEuaCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyQXJlbmEuaAppbmRleCAzNmRiYmQ0YTU2NGIyM2M5 NDY4MWUzOWFjYTQ3ODY3ZjhlYzIwZjE4Li40ZDljMTlkMGNkYjcxN2Y2YjYzMjYwMDk5ZmVmNmY4 YTcxMTVhOGVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNl ckFyZW5hLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXJBcmVuYS5o CkBAIC01MCw2ICs1MCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBBTFdBWVNfSU5MSU5F IGNvbnN0IElkZW50aWZpZXImIG1ha2VJZGVudGlmaWVyTENoYXJGcm9tVUNoYXIoVk0mLCBjb25z dCBVQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IGxlbmd0aCk7CiAgICAgICAgIEFMV0FZU19JTkxJ TkUgY29uc3QgSWRlbnRpZmllciYgbWFrZUlkZW50aWZpZXIoVk0mLCBTeW1ib2xJbXBsKik7CiAK KyAgICAgICAgY29uc3QgSWRlbnRpZmllciYgbWFrZUJpZ0ludERlY2ltYWxJZGVudGlmaWVyKFZN JiwgY29uc3QgSWRlbnRpZmllciYsIHVpbnQ4X3QgcmFkaXgpOwogICAgICAgICBjb25zdCBJZGVu dGlmaWVyJiBtYWtlTnVtZXJpY0lkZW50aWZpZXIoVk0mLCBkb3VibGUgbnVtYmVyKTsKIAogICAg IHB1YmxpYzoKZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VM b2cKaW5kZXggZjllMTFiZDQ3OWJhMTUwNDc0OGY1ODNiYTZmYTMxMjVlMzc4NDUzMS4uYmJiMjY4 MTc2ZWY4MjJkZmM4YjViZGViY2RlYzcxYjkxMmQxZjhiMyAxMDA2NDQKLS0tIGEvSlNUZXN0cy9D aGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMC0w Mi0xMSAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFpbC5jb20+CisKKyAgICAgICAgW0VTTmV4 dF1bQmlnSW50XSBXZSBkb24ndCBzdXBwb3J0IEJpZ0ludCBsaXRlcmFsIGFzIFByb3BlcnR5TmFt ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2ODg4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUm9zcyBLaXJzbGluZy4KKworICAgICAgICAqIHN0cmVz cy9iaWctaW50LWFzLXByb3BlcnR5LW5hbWUuanM6IEFkZGVkLgorCiAyMDIwLTAyLTEwICBNYXJr IExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBQbGFjYXRlIGV4Y2VwdGlvbiBj aGVjayB2YWxpZGF0b3IgaW4gR2VuZXJpY0FyZ3VtZW50czxUeXBlPjo6cHV0KCkuCmRpZmYgLS1n aXQgYS9KU1Rlc3RzL3N0cmVzcy9iaWctaW50LWFzLXByb3BlcnR5LW5hbWUuanMgYi9KU1Rlc3Rz L3N0cmVzcy9iaWctaW50LWFzLXByb3BlcnR5LW5hbWUuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDFlNGNhZmQ4 YjFhMWFjZWQ1NDA0ZjdlNWY2ODkxZDk3OTk4NWRjYwotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVz dHMvc3RyZXNzL2JpZy1pbnQtYXMtcHJvcGVydHktbmFtZS5qcwpAQCAtMCwwICsxLDk0IEBACisv L0AgcnVuRGVmYXVsdCgiLS11c2VCaWdJbnQ9dHJ1ZSIsICItLXVzZUNsYXNzRmllbGRzPXRydWUi KQorCitsZXQgYXNzZXJ0ID0geworICAgIHNhbWVWYWx1ZShhLCBlKSB7CisgICAgICAgIGlmIChh ICE9PSBlKQorICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJFeHBlY3RlZDogIiArIGUgKyAi IGJ1dCBnb3Q6ICIgKyBhKTsKKyAgICB9LAorICAgIHNhbWVBcnJheShhLCBlKSB7CisgICAgICAg IGlmIChhLmxlbmd0aCAhPSBlLmxlbmd0aCkKKyAgICAgICAgICAgIHRocm93IG5ldyBFcnJvcigi R290IGFycmF5OiAiICsgYSArICIgYnV0IGV4cGVjdGVkOiAiICsgZSk7CisKKyAgICAgICAgZm9y IChsZXQgaSA9IDA7IGkgPCBhLmxlbmd0aDsgaSsrKSB7CisgICAgICAgICAgICBpZiAoYVtpXSAh PT0gZVtpXSkKKyAgICAgICAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoIkdvdCBhcnJheTogIiAr IGEgKyAiIGJ1dCBleHBlY3RlZDogIiArIGUpOworICAgICAgICB9CisgICAgfQorfTsKKworLy8g T2JqZWN0IExpdGVyYWwKKworbGV0IG8gPSB7CisgICAgMzBuOiAiMzAiLAorICAgIDBvMW46ICIx IiwKKyAgICAwYjEwbjogIjIiLAorICAgIDB4YW46ICIxMCIsCisgICAgMV8yXzNuOiAiMV8yXzMi Cit9OworYXNzZXJ0LnNhbWVWYWx1ZShvWyIxIl0sICIxIik7Cithc3NlcnQuc2FtZVZhbHVlKG9b IjIiXSwgIjIiKTsKK2Fzc2VydC5zYW1lVmFsdWUob1siMTAiXSwgIjEwIik7Cithc3NlcnQuc2Ft ZVZhbHVlKG9bIjEyMyJdLCAiMV8yXzMiKTsKKworLy8gTWV0aG9kRGVjbGFyYXRpb24KKworbyA9 IHsKKyAgMGIxbigpIHt9LAorICAqMG8ybigpIHt9LAorICBhc3luYyAweDNuKCkge30sCisgIGFz eW5jKiA0bigpIHt9LAorICBnZXQgNW4oKSB7fSwKKyAgc2V0IDZuKHgpIHt9LAorICA3bjogZnVu Y3Rpb24gKCkge30KK307CisKK2Fzc2VydC5zYW1lQXJyYXkoT2JqZWN0LmdldE93blByb3BlcnR5 TmFtZXMobyksIFsiMSIsICIyIiwgIjMiLCAiNCIsICI1IiwgIjYiLCAiNyJdKTsKKworYXNzZXJ0 LnNhbWVWYWx1ZShvWzFdLm5hbWUsICIxIik7Cithc3NlcnQuc2FtZVZhbHVlKG9bMl0ubmFtZSwg IjIiKTsKK2Fzc2VydC5zYW1lVmFsdWUob1szXS5uYW1lLCAiMyIpOworYXNzZXJ0LnNhbWVWYWx1 ZShvWzRdLm5hbWUsICI0Iik7Cithc3NlcnQuc2FtZVZhbHVlKE9iamVjdC5nZXRPd25Qcm9wZXJ0 eURlc2NyaXB0b3IobywgNSkuZ2V0Lm5hbWUsICJnZXQgNSIpOworYXNzZXJ0LnNhbWVWYWx1ZShP YmplY3QuZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKG8sIDYpLnNldC5uYW1lLCAic2V0IDYiKTsK K2Fzc2VydC5zYW1lVmFsdWUob1s3XS5uYW1lLCAiNyIpOworCit7CisgICAgY2xhc3MgQyB7Cisg ICAgICAgIDBiMW4oKSB7fTsKKyAgICAgICAgKjBvMm4oKSB7fTsKKyAgICAgICAgYXN5bmMgMHgz bigpIHt9OworICAgICAgICBhc3luYyogNG4oKSB7fTsKKyAgICAgICAgZ2V0IDVuKCkge307Cisg ICAgICAgIHNldCA2bih4KSB7fTsKKyAgICB9CisKKyAgICBsZXQgYyA9IEMucHJvdG90eXBlOwor ICAgIGFzc2VydC5zYW1lQXJyYXkoT2JqZWN0LmdldE93blByb3BlcnR5TmFtZXMoYyksIFsiMSIs ICIyIiwgIjMiLCAiNCIsICI1IiwgIjYiLCAiY29uc3RydWN0b3IiXSk7CisgICAgYXNzZXJ0LnNh bWVWYWx1ZShjWzFdLm5hbWUsICIxIik7CisgICAgYXNzZXJ0LnNhbWVWYWx1ZShjWzJdLm5hbWUs ICIyIik7CisgICAgYXNzZXJ0LnNhbWVWYWx1ZShjWzNdLm5hbWUsICIzIik7CisgICAgYXNzZXJ0 LnNhbWVWYWx1ZShjWzRdLm5hbWUsICI0Iik7CisgICAgYXNzZXJ0LnNhbWVWYWx1ZShPYmplY3Qu Z2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKGMsIDUpLmdldC5uYW1lLCAiZ2V0IDUiKTsKKyAgICBh c3NlcnQuc2FtZVZhbHVlKE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoYywgNikuc2V0 Lm5hbWUsICJzZXQgNiIpOworfQorCisvLyBGaWVsZCBkZWNsYXJhdGlvbgoreworICAgIGNsYXNz IEMgeworICAgICAgICAwbzFuID0gImJheiI7CisgICAgICAgIDBiMTBuID0gZnVuY3Rpb24gKCkg e307CisgICAgfQorCisgICAgbGV0IGMgPSBuZXcgQygpOworICAgIGFzc2VydC5zYW1lVmFsdWUo Y1sxbl0sICJiYXoiKTsKKyAgICBhc3NlcnQuc2FtZVZhbHVlKGNbMV0sICJiYXoiKTsKKyAgICBh c3NlcnQuc2FtZVZhbHVlKGNbIjEiXSwgImJheiIpOworCisgICAgYXNzZXJ0LnNhbWVWYWx1ZShj WzJdLm5hbWUsICIyIik7Cit9CisKKy8vIERlc3RydWN0dXJpbmcKKworbGV0IHsxbjogYX0gPSB7 MW46ICJmb28ifTsKK2Fzc2VydC5zYW1lVmFsdWUoYSwgImZvbyIpOworCg==