145176 2015-05-19 13:21:27 -0700 For flex box items, margins and padding should resolve against their respective dimensions, not always containing block width 2022-01-25 02:03:09 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 simon.fraser svillar cdumez changseok eoconnor esprehn+autocc ews-watchlist glenn hyatt jfernandez koivisto kondapallykalyan pdr rego simon.fraser svillar zalan oldest_to_newest 1096014 0 simon.fraser 2015-05-19 13:21:27 -0700 We don't respect the flex box margin/padding % resolution rules here: http://dev.w3.org/csswg/css-flexbox/#item-margins 1096069 1 eoconnor 2015-05-19 15:11:30 -0700 Updated title to scope change just to flex items 1751853 2 426442 svillar 2021-04-19 10:25:59 -0700 Created attachment 426442 Patch 1752201 3 426531 svillar 2021-04-20 02:51:38 -0700 Created attachment 426531 Patch 1808562 4 442407 svillar 2021-10-25 13:44:53 -0700 Created attachment 442407 Patch 1833638 5 442407 svillar 2022-01-25 02:03:09 -0800 Comment on attachment 442407 Patch Marking the patch as obsolete. Modifying styles is a bad idea. 426442 2021-04-19 10:25:59 -0700 2021-04-20 02:51:32 -0700 Patch bug-145176-20210419192557.patch text/plain 13001 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQwNDA3MzA5ZTA4ZDIy ZjE2OTczNzE0ZDM1YjJmZTc1YzZhMjI4NS4uMTA2NTE0MThmNjc4YmIyODhiMmNmMjEzNjhkNjlj OGZmZTMwOGI3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA0LTE5ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIEZvciBmbGV4 IGJveCBpdGVtcywgbWFyZ2lucyBhbmQgcGFkZGluZyBzaG91bGQgcmVzb2x2ZSBhZ2FpbnN0IHRo ZWlyIHJlc3BlY3RpdmUgZGltZW5zaW9ucywgbm90IGFsd2F5cyBjb250YWluaW5nIGJsb2NrIHdp ZHRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDUx NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVu ZXZlciBhIGZsZXggaXRlbSBoYXMgYW4gaW50cmluc2ljIHNpemUgaW4gdGhlIG1haW4gYXhpcywg d2UgbmVlZCB0byBwcmUtbGF5b3V0IGl0IGJlZm9yZSBydW5uaW5nIHRoZSBmbGV4IGxheW91dCBh bGdvcml0aG0KKyAgICAgICAgaW4gb3JkZXIgdG8gb2J0YWluIGl0cyBpbnRyaW5zaWMgc2l6ZSB0 byBiZSBhYmxlIHRvIHByb3Blcmx5IGNvbXB1dGUgdGhlIGZsZXggYmFzaXMuIFVuZm9ydHVuYXRl bHkgdGhhdCBpcyBub3QgZW5vdWdoIHdoZW4gdGhlCisgICAgICAgIGZsZXggaXRlbSBoYXMgY2hp bGRyZW4gd2l0aCByZWxhdGl2ZSAocGVyY2VudGFnZSkgc2l6ZXMuIEluIHRoYXQgY2FzZSwgd2Ug aGF2ZSBhIGNpcmN1bGFyIGRlcGVuZGVuY3ksIHRoZSBmbGV4IGl0ZW0gbmVlZHMgdG8ga25vdwor ICAgICAgICB0aGUgc2l6ZSBvZiBpdHMgY2hpbGRyZW4gdG8gY29tcHV0ZSBpdHMgaW50cmluc2lj IHNpemUsIGJ1dCB0aGUgY2hpbGRyZW4gbmVlZCBmaXJzdCB0aGUgc2l6ZSBvZiBpdHMgcGFyZW50 IHRvIGNvbXB1dGUgdGhlaXIgcmVsYXRpdmUKKyAgICAgICAgc2l6ZXMuIFRoZSBmaW5hbCByZXN1 bHQgaXMgd3JvbmcgYW5kIHdvdWxkIGJlIHVzZWQgdG8gY29tcHV0ZSB0aGUgZmxleCBiYXNpcyAo d2hpY2ggd291bGQgYmUgd3JvbmcgdG9vKS4KKworICAgICAgICBJbiBjYXNlIG9mIGhhdmluZyBh IGZsZXggY29udGFpbmVyIHdpdGggYSBkZWZpbml0ZSBjcm9zcyBzaXplLCB3ZSBjb3VsZCBhc3N1 bWUgdGhhdCBldmVyeSBzdHJldGNoZWQgZmxleCBpdGVtIHdpdGggYXV0b21hdGljIHNpemUKKyAg ICAgICAgd291bGQgYmUgc3RyZXRjaGVkIHRvIHRoYXQgZGVmaW5pdGUgc2l6ZSAoc2VlIGh0dHBz Oi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jZGVmaW5pdGUtc2l6ZXMpLiBUaGlzIG1l YW5zIHRoYXQgd2UgY2FuCisgICAgICAgIG92ZXJyaWRlIHRoZSBjcm9zcyBzaXplIG9mIHRoZSBp dGVtIGJlZm9yZSBkb2luZyB0aGF0IHByZS1sYXlvdXQuIFRoaXMgd2F5IGl0cyBjaGlsZHJlbiB3 b3VsZCBiZSBsYWlkIG91dCB1c2luZyB0aGUgZmluYWwKKyAgICAgICAgc3RyZXRjaGVkIHNpemUg d2hpY2ggd291bGQgYmUgdGhlIHJpZ2h0IG9uZSB0byB1c2UuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmNyb3NzQXhpc01hcmdpbkV4dGVudEZvckNoaWxkIGNvbnN0KTogQWRkZWQgYW4gQVNT RVJUIHRvIHByZXZlbnQgd3JvbmcgdXNhZ2Ugb2YgdGhlIG1ldGhvZC4KKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleENvbnRhaW5lcklubmVyQ3Jvc3NTaXpl IGNvbnN0KTogUmVmYWN0b3JlZCBmcm9tIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1Vz aW5nKCkuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5T aXplRnJvbUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOiBVc2UgY29tcHV0ZUZsZXhDb250YWluZXJJ bm5lckNyb3NzU2l6ZSgpLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmZs ZXhJdGVtU2hvdWxkU3RyZXRjaFRvQ29udGFpbmVyRGVmaW5pdGVDcm9zc1NpemUgY29uc3QpOiBl eHRyYWN0ZWQgZnJvbQorICAgICAgICBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNy b3NzU2l6ZSgpLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jv c3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplIGNvbnN0KTogVXNlIHRoZSBuZXdseSBh ZGRlZAorICAgICAgICBmbGV4SXRlbVNob3VsZFN0cmV0Y2hUb0NvbnRhaW5lckRlZmluaXRlQ3Jv c3NTaXplKCkKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlQW5k U2V0Q2hpbGRNYXJnaW5zRnJvbVNpemUgY29uc3QpOiBOZXcgbWV0aG9kIHRoYXQgc2V0cyB0aGUg Y2hpbGQgbWFyZ2lucyBpbiB0aGUgbWFpbiBheGlzLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy RmxleGlibGVCb3g6OmNvbnN0cnVjdEZsZXhJdGVtKTogU2V0IGFuIG92ZXJyaWRpbmcgc2l6ZSBp biB0aGUgY3Jvc3MgYXhpcyBiZWZvcmUgdGhlIHByZS1sYXlvdXQgdG8gY29tcHV0ZQorICAgICAg ICBpbnRyaW5zaWMgc2l6ZXMuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94 Lmg6CisKIDIwMjEtMDQtMTkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXSBUaGUgbGF5b3V0IGNvbnRhaW5tZW50IGJveCBlc3RhYmxpc2hlcyBhbiBhYnNv bHV0ZSBwb3NpdGlvbmluZyBjb250YWluaW5nIGJsb2NrIGFuZCBhIGZpeGVkIHBvc2l0aW9uaW5n IGNvbnRhaW5pbmcgYmxvY2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guY3BwCmluZGV4IGRiODMyYTViMmVmMGU1NGRjMTI4ZTVhMTc1YjY5MTEwM2MwZmE2 OGQuLmYwNTI1NGE0YWEwMGVlZDMzNzU4NjlkN2JmNzVmYmJkNGI5ZTdjMDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNzI3LDYgKzcy Nyw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmZsb3dBd2FyZU1hcmdpbkJlZm9y ZUZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpCiAKIExheW91dFVuaXQgUmVuZGVyRmxleGli bGVCb3g6OmNyb3NzQXhpc01hcmdpbkV4dGVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hp bGQpIGNvbnN0CiB7CisgICAgQVNTRVJUKGNoaWxkLmV2ZXJIYWRMYXlvdXQoKSk7CiAgICAgcmV0 dXJuIGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLnZlcnRpY2FsTWFyZ2luRXh0ZW50KCkgOiBj aGlsZC5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCk7CiB9CiAKQEAgLTc3OSw2ICs3ODAsMTQgQEAg Ym9vbCBSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJC b3gmIGNoaWxkKQogICAgIHJldHVybiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNy b3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1haW5PclByZWZlcnJlZFNpemUsIGNoaWxkKSk7CiB9CiAK K0xheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVGbGV4Q29udGFpbmVySW5uZXJD cm9zc1NpemUoKSBjb25zdAoreworICAgIGF1dG8gY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoID0g aXNIb3Jpem9udGFsRmxvdygpID8gc3R5bGUoKS5oZWlnaHQoKSA6IHN0eWxlKCkud2lkdGgoKTsK KyAgICAvLyBLZWVwIHRoaXMgc3luYydlZCB3aXRoIGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29u dGFpbmVyQ3Jvc3NTaXplKCkuCisgICAgQVNTRVJUKGNvbnRhaW5lckNyb3NzU2l6ZUxlbmd0aC5p c0ZpeGVkKCkpOworICAgIHJldHVybiB2YWx1ZUZvckxlbmd0aChjb250YWluZXJDcm9zc1NpemVM ZW5ndGgsIC0xX2x1KTsKK30KKwogLy8gRklYTUU6IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RS YXRpb1VzaW5nIG1heSBuZWVkIHRvIHJldHVybiBhbiBPcHRpb25hbDxMYXlvdXRVbml0PiBpbiB0 aGUgZnV0dXJlCiAvLyByYXRoZXIgdGhhbiByZXR1cm5pbmcgaW5kZWZpbml0ZSBzaXplcyBhcyAw Ly0xLgogTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFz cGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNyb3NzU2l6ZUxl bmd0aCkgY29uc3QKQEAgLTgwMSwxMCArODEwLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJs ZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8K ICAgICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9yQm94U2l6aW5nKGNoaWxkLCBjcm9zc1NpemVM ZW5ndGgpOwogICAgIGVsc2UgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0F1dG8oKSkgewogICAgICAg ICBBU1NFUlQoY2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY2hpbGQp KTsKLSAgICAgICAgYXV0byBjb250YWluZXJDcm9zc1NpemVMZW5ndGggPSBpc0hvcml6b250YWxG bG93KCkgPyBzdHlsZSgpLmhlaWdodCgpIDogc3R5bGUoKS53aWR0aCgpOwotICAgICAgICAvLyBL ZWVwIHRoaXMgc3luYydlZCB3aXRoIGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jv c3NTaXplKCkuCi0gICAgICAgIEFTU0VSVChjb250YWluZXJDcm9zc1NpemVMZW5ndGguaXNGaXhl ZCgpKTsKLSAgICAgICAgY3Jvc3NTaXplID0gdmFsdWVGb3JMZW5ndGgoY29udGFpbmVyQ3Jvc3NT aXplTGVuZ3RoLCAtMV9sdSk7CisgICAgICAgIGNyb3NzU2l6ZSA9IGNvbXB1dGVGbGV4Q29udGFp bmVySW5uZXJDcm9zc1NpemUoKTsKICAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQoY3Jvc3NT aXplTGVuZ3RoLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKTsKICAgICAgICAgY3Jvc3NTaXplID0g bWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkgPyBjaGlsZC5jb21wdXRlUGVyY2VudGFn ZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXplTGVuZ3RoKSA6IGFkanVzdEJvcmRlckJveExvZ2ljYWxX aWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChjcm9zc1NpemVMZW5ndGgsIGNvbnRlbnRX aWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3RoLnR5cGUoKSk7CkBAIC04NTksMTUgKzg2NSw4IEBAIGJv b2wgUmVuZGVyRmxleGlibGVCb3g6OmNoaWxkTWFpblNpemVJc0RlZmluaXRlKGNvbnN0IFJlbmRl ckJveCYgY2hpbGQsIGNvbnN0IExlCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgUmVuZGVy RmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNv bnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0Citib29sIFJlbmRlckZsZXhpYmxlQm94OjpmbGV4 SXRlbVNob3VsZFN0cmV0Y2hUb0NvbnRhaW5lckRlZmluaXRlQ3Jvc3NTaXplKGNvbnN0IFJlbmRl ckJveCYgY2hpbGQpIGNvbnN0CiB7Ci0gICAgaWYgKCFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxk KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgp LmhlaWdodCgpICYmICFjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKLSAgICAgICAg Ly8gV2UgY2FuJ3QgY29tcHV0ZSBhIHJhdGlvIGluIHRoaXMgY2FzZS4KLSAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgIH0KLQogICAgIC8vIDkuOCBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3Nz LWZsZXhib3gvI2RlZmluaXRlLXNpemVzCiAgICAgLy8gMS4gSWYgYSBzaW5nbGUtbGluZSBmbGV4 IGNvbnRhaW5lciBoYXMgYSBkZWZpbml0ZSBjcm9zcyBzaXplLCB0aGUgYXV0b21hdGljIHByZWZl cnJlZCBvdXRlciBjcm9zcyBzaXplIG9mIGFueQogICAgIC8vIHN0cmV0Y2hlZCBmbGV4IGl0ZW1z IGlzIHRoZSBmbGV4IGNvbnRhaW5lcidzIGlubmVyIGNyb3NzIHNpemUgKGNsYW1wZWQgdG8gdGhl IGZsZXggaXRlbSdzIG1pbiBhbmQgbWF4IGNyb3NzIHNpemUpCkBAIC04ODEsNiArODgwLDE3IEBA IGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVy Q3Jvc3NTaXplKGNvbnN0IFJlbmRlckJvCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCitib29sIFJl bmRlckZsZXhpYmxlQm94OjpjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6 ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAoreworICAgIGlmICghY2hpbGRIYXNBc3Bl Y3RSYXRpbyhjaGlsZCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWNoaWxkLmlu dHJpbnNpY1NpemUoKS5oZWlnaHQoKSAmJiAhY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygp KSB7CisgICAgICAgIC8vIFdlIGNhbid0IGNvbXB1dGUgYSByYXRpbyBpbiB0aGlzIGNhc2UuCisg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIGZsZXhJdGVtU2hvdWxkU3Ry ZXRjaFRvQ29udGFpbmVyRGVmaW5pdGVDcm9zc1NpemUoY2hpbGQpOworfQorCiBib29sIFJlbmRl ckZsZXhpYmxlQm94OjpjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY29uc3QgUmVuZGVyQm94JiBj aGlsZCwgY29uc3QgTGVuZ3RoJiBsZW5ndGgpCiB7CiAgICAgaWYgKGxlbmd0aC5pc0F1dG8oKSkK QEAgLTEyNzksOCArMTI4OSw0NiBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1 c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChjbwogICAgIHJldHVy biBjaGlsZFNpemU7CiB9CiAKK3ZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVBbmRTZXRD aGlsZE1hcmdpbnNGcm9tU2l6ZShSZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0IHNpemUpIGNv bnN0Cit7CisgICAgQVNTRVJUKCFjaGlsZC5ldmVySGFkTGF5b3V0KCkpOworICAgIGlmIChtYWlu QXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSkgeworICAgICAgICBjaGlsZC5jb21wdXRlQW5k U2V0QmxvY2tEaXJlY3Rpb25NYXJnaW5zKCp0aGlzKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIExheW91dFVuaXQgbWFyZ2luU3RhcnQ7CisgICAgTGF5b3V0VW5pdCBtYXJnaW5FbmQ7 CisgICAgY2hpbGQuY29tcHV0ZUlubGluZURpcmVjdGlvbk1hcmdpbnMoKnRoaXMsIHNpemUsIHNp emUsIG1hcmdpblN0YXJ0LCBtYXJnaW5FbmQpOworICAgIHNldE1hcmdpblN0YXJ0Rm9yQ2hpbGQo Y2hpbGQsIG1hcmdpblN0YXJ0KTsKKyAgICBzZXRNYXJnaW5FbmRGb3JDaGlsZChjaGlsZCwgbWFy Z2luRW5kKTsKK30KKwogRmxleEl0ZW0gUmVuZGVyRmxleGlibGVCb3g6OmNvbnN0cnVjdEZsZXhJ dGVtKFJlbmRlckJveCYgY2hpbGQsIGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKIHsKKyAgICBhdXRv IGNvbnN0cmFpbkJ5TWluTWF4ID0gW3RoaXNdKFJlbmRlckJveCYgY2hpbGQsIExheW91dFVuaXQm IHNpemUpIC0+IHZvaWQgeworICAgICAgICBhdXRvIG1pbiA9IGNyb3NzU2l6ZUxlbmd0aEZvckNo aWxkKE1pblNpemUsIGNoaWxkKTsKKyAgICAgICAgYXV0byBtYXggPSBjcm9zc1NpemVMZW5ndGhG b3JDaGlsZChNYXhTaXplLCBjaGlsZCk7CisgICAgICAgIGlmIChtYXguaXNGaXhlZCgpKQorICAg ICAgICAgICAgc2l6ZSA9IHN0ZDo6bWluKHNpemUsIHZhbHVlRm9yTGVuZ3RoKG1heCwgLTFfbHUp KTsKKyAgICAgICAgaWYgKG1pbi5pc0ZpeGVkKCkpCisgICAgICAgICAgICBzaXplID0gc3RkOjpt YXgoc2l6ZSwgdmFsdWVGb3JMZW5ndGgobWluLCAtMV9sdSkpOworICAgIH07CisgICAgLy8gU3Ry ZXRjaCBpbiBhZHZhbmNlIHRob3NlIGZsZXggaXRlbXMgdGhhdCB3b3VsZCBiZSBzdHJldGNoZWQg bGF0ZXIgc28gdGhhdCB3ZSBjb3VsZCB1c2UgdGhhdAorICAgIC8vIHN0cmV0Y2hlZCB2YWx1ZSB0 byBkZXRlcm1pbmUgdGhlIGNoaWxkIGludHJpbnNpYyBzaXplIGFuZCB0aGUgZmxleCBiYXNlIHNp emUuCisgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94LyNkZWZpbml0 ZS1zaXplcworICAgIGF1dG8gcHJlU3RyZXRjaEZsZXhJdGVtID0gW3RoaXMsICZjb25zdHJhaW5C eU1pbk1heF0oUmVuZGVyQm94JiBjaGlsZCkgLT4gdm9pZCB7CisgICAgICAgIGF1dG8gc2l6ZSA9 IGNvbXB1dGVGbGV4Q29udGFpbmVySW5uZXJDcm9zc1NpemUoKTsKKyAgICAgICAgaWYgKFVOTElL RUxZKCFjaGlsZC5ldmVySGFkTGF5b3V0KCkpKQorICAgICAgICAgICAgY29tcHV0ZUFuZFNldENo aWxkTWFyZ2luc0Zyb21TaXplKGNoaWxkLCBzaXplKTsKKyAgICAgICAgc2l6ZSA9IHN0ZDo6bWF4 KDBfbHUsIHNpemUgLSBjcm9zc0F4aXNNYXJnaW5FeHRlbnRGb3JDaGlsZChjaGlsZCkpOworICAg ICAgICBjb25zdHJhaW5CeU1pbk1heChjaGlsZCwgc2l6ZSk7CisgICAgICAgIGlmIChtYWluQXhp c0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSkKKyAgICAgICAgICAgIGNoaWxkLnNldE92ZXJyaWRp bmdMb2dpY2FsSGVpZ2h0KHNpemUpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBjaGlsZC5z ZXRPdmVycmlkaW5nTG9naWNhbFdpZHRoKHNpemUpOworICAgIH07CisKICAgICBjaGlsZC5jbGVh ck92ZXJyaWRpbmdDb250ZW50U2l6ZSgpOwogICAgIGlmIChjaGlsZEhhc0ludHJpbnNpY01haW5B eGlzU2l6ZShjaGlsZCkpIHsKICAgICAgICAgLy8gSWYgdGhpcyBjb25kaXRpb24gaXMgdHJ1ZSwg dGhlbiBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCB3aWxsIGNhbGwKQEAgLTEyOTcsNiAr MTM0NSw4IEBAIEZsZXhJdGVtIFJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4SXRlbShS ZW5kZXJCb3gmIGNoaWxkLCBib29sIHJlbGF5b3V0Q2hpCiAgICAgICAgICAgICBlbHNlCiAgICAg ICAgICAgICAgICAgY2hpbGQuc2V0T3ZlcnJpZGluZ0NvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dp Y2FsV2lkdGgoV1RGOjpudWxsb3B0KTsKICAgICAgICAgICAgIGNoaWxkLmNsZWFyT3ZlcnJpZGlu Z0NvbnRlbnRTaXplKCk7CisgICAgICAgICAgICBpZiAoY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQo TWFpbk9yUHJlZmVycmVkU2l6ZSwgY2hpbGQpLmlzQXV0bygpICYmIGZsZXhJdGVtU2hvdWxkU3Ry ZXRjaFRvQ29udGFpbmVyRGVmaW5pdGVDcm9zc1NpemUoY2hpbGQpKQorICAgICAgICAgICAgICAg IHByZVN0cmV0Y2hGbGV4SXRlbShjaGlsZCk7CiAgICAgICAgICAgICBjaGlsZC5zZXRDaGlsZE5l ZWRzTGF5b3V0KE1hcmtPbmx5VGhpcyk7CiAgICAgICAgICAgICBjaGlsZC5sYXlvdXRJZk5lZWRl ZCgpOwogICAgICAgICAgICAgY2FjaGVDaGlsZE1haW5TaXplKGNoaWxkKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggYzY2YzkxMTY2ZmNlNGQ1 NDU4YWY3ZTE5ZTU0OTVhODM1N2QwODEyZS4uZjM3YTE4ZjE5YWNlNTc5MWIxYWU5NTc3ZTk0M2Y4 NWYyZDRlNzMxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs ZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl Qm94LmgKQEAgLTE0Myw3ICsxNDMsOSBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgY3Jvc3NB eGlzU2Nyb2xsYmFyRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7 CiAgICAgTGF5b3V0UG9pbnQgZmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJC b3gmIGNoaWxkKSBjb25zdDsKICAgICBib29sIHVzZUNoaWxkQXNwZWN0UmF0aW8oY29uc3QgUmVu ZGVyQm94JiBjaGlsZCk7CisgICAgYm9vbCBmbGV4SXRlbVNob3VsZFN0cmV0Y2hUb0NvbnRhaW5l ckRlZmluaXRlQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIGJv b2wgY2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY29uc3QgUmVuZGVy Qm94JiBjaGlsZCkgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBjb21wdXRlRmxleENvbnRhaW5lcklu bmVyQ3Jvc3NTaXplKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlTWFpblNpemVGcm9t QXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBMZW5ndGggY3Jvc3NTaXpl TGVuZ3RoKSBjb25zdDsKICAgICB2b2lkIHNldEZsb3dBd2FyZUxvY2F0aW9uRm9yQ2hpbGQoUmVu ZGVyQm94JiBjaGlsZCwgY29uc3QgTGF5b3V0UG9pbnQmKTsKICAgICBMYXlvdXRVbml0IGNvbXB1 dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIExheW91dFVuaXQg bWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nKTsKQEAgLTE3NSw2ICsxNzcsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgcHJlcGFyZU9yZGVySXRlcmF0b3JBbmRNYXJnaW5zKCk7CiAgICAgTGF5b3V0VW5p dCBhZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGF5 b3V0VW5pdCBjaGlsZFNpemUpOwogICAgIExheW91dFVuaXQgYWRqdXN0Q2hpbGRTaXplRm9yQXNw ZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGF5b3V0 VW5pdCBjaGlsZFNpemUpOworICAgIHZvaWQgY29tcHV0ZUFuZFNldENoaWxkTWFyZ2luc0Zyb21T aXplKFJlbmRlckJveCYgY2hpbGQsIExheW91dFVuaXQpIGNvbnN0OwogICAgIEZsZXhJdGVtIGNv bnN0cnVjdEZsZXhJdGVtKFJlbmRlckJveCYsIGJvb2wgcmVsYXlvdXRDaGlsZHJlbik7CiAgICAg CiAgICAgdm9pZCBmcmVlemVJbmZsZXhpYmxlSXRlbXMoRmxleFNpZ24sIFZlY3RvcjxGbGV4SXRl bT4mIGNoaWxkcmVuLCBMYXlvdXRVbml0JiByZW1haW5pbmdGcmVlU3BhY2UsIGRvdWJsZSYgdG90 YWxGbGV4R3JvdywgZG91YmxlJiB0b3RhbEZsZXhTaHJpbmssIGRvdWJsZSYgdG90YWxXZWlnaHRl ZEZsZXhTaHJpbmspOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDA4NDRmNDFjMTg4MmFjMmE1YjZkYjM5ZDk0YzQxY2U1OTNh OTZiYWUuLjUwZTg3YzFmOWFkMWNiNDdhZjAxYTM1MzM5MTI5YmI2Y2YwZjcyZmMgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxMiBAQAorMjAyMS0wNC0xOSAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJA aWdhbGlhLmNvbT4KKworICAgICAgICBGb3IgZmxleCBib3ggaXRlbXMsIG1hcmdpbnMgYW5kIHBh ZGRpbmcgc2hvdWxkIHJlc29sdmUgYWdhaW5zdCB0aGVpciByZXNwZWN0aXZlIGRpbWVuc2lvbnMs IG5vdCBhbHdheXMgY29udGFpbmluZyBibG9jayB3aWR0aAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1MTc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOiBVbnNraXBwZWQg YSB0ZXN0IHRoYXQgaXMgbm93IHBhc3NpbmcuCisKIDIwMjEtMDQtMTkgIFBoaWxpcHBlIE5vcm1h bmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIFdQRSBnYXJk ZW5pbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDZjZmM2NTZjMmI0MTBmNDQ1Njg2NWIzNzEzYmMy ODM0OTEzNDNlNDguLjJjNTdhNmM1MjU1N2IwMmI2YjdhNDM2Y2I2YzhlYTY1YTRiOWMxNjcgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMv VGVzdEV4cGVjdGF0aW9ucwpAQCAtMzkwMyw3ICszOTAzLDYgQEAgd2Via2l0Lm9yZy9iLzIxOTM0 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFz cGVjdC0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMTAuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWctcm93LTAx My5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8xNDUxNzYgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleGJveF9hbGlnbi1p dGVtcy1zdHJldGNoLTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx MDA5MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9zZWxl Y3QtZWxlbWVudC16ZXJvLWhlaWdodC0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi a2l0Lm9yZy9iLzIxMDE0NCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt ZmxleGJveC9hbm9ueW1vdXMtZmxleC1pdGVtLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjEwNDc4IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1mbGV4Ym94L3BlcmNlbnRhZ2UtaGVpZ2h0cy0wMDYuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQo= 426531 2021-04-20 02:51:38 -0700 2021-10-25 13:13:50 -0700 Patch bug-145176-20210420115136.patch text/plain 12537 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQwNDA3MzA5ZTA4ZDIy ZjE2OTczNzE0ZDM1YjJmZTc1YzZhMjI4NS4uN2EyNWUxMzVmZTY1NWE3ZjYzMzA3YjFmMjEwNjdj NzY5MDY3MDAwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTA0LTE5ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIEZvciBmbGV4 IGJveCBpdGVtcywgbWFyZ2lucyBhbmQgcGFkZGluZyBzaG91bGQgcmVzb2x2ZSBhZ2FpbnN0IHRo ZWlyIHJlc3BlY3RpdmUgZGltZW5zaW9ucywgbm90IGFsd2F5cyBjb250YWluaW5nIGJsb2NrIHdp ZHRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDUx NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVu ZXZlciBhIGZsZXggaXRlbSBoYXMgYW4gaW50cmluc2ljIHNpemUgaW4gdGhlIG1haW4gYXhpcywg d2UgbmVlZCB0byBwcmUtbGF5b3V0IGl0IGJlZm9yZSBydW5uaW5nIHRoZSBmbGV4IGxheW91dCBh bGdvcml0aG0KKyAgICAgICAgaW4gb3JkZXIgdG8gb2J0YWluIGl0cyBpbnRyaW5zaWMgc2l6ZSB0 byBiZSBhYmxlIHRvIHByb3Blcmx5IGNvbXB1dGUgdGhlIGZsZXggYmFzaXMuIFVuZm9ydHVuYXRl bHkgdGhhdCBpcyBub3QgZW5vdWdoIHdoZW4gdGhlCisgICAgICAgIGZsZXggaXRlbSBoYXMgY2hp bGRyZW4gd2l0aCByZWxhdGl2ZSAocGVyY2VudGFnZSkgc2l6ZXMuIEluIHRoYXQgY2FzZSwgd2Ug aGF2ZSBhIGNpcmN1bGFyIGRlcGVuZGVuY3ksIHRoZSBmbGV4IGl0ZW0gbmVlZHMgdG8ga25vdwor ICAgICAgICB0aGUgc2l6ZSBvZiBpdHMgY2hpbGRyZW4gdG8gY29tcHV0ZSBpdHMgaW50cmluc2lj IHNpemUsIGJ1dCB0aGUgY2hpbGRyZW4gbmVlZCBmaXJzdCB0aGUgc2l6ZSBvZiBpdHMgcGFyZW50 IHRvIGNvbXB1dGUgdGhlaXIgcmVsYXRpdmUKKyAgICAgICAgc2l6ZXMuIFRoZSBmaW5hbCByZXN1 bHQgaXMgd3JvbmcgYW5kIHdvdWxkIGJlIHVzZWQgdG8gY29tcHV0ZSB0aGUgZmxleCBiYXNpcyAo d2hpY2ggd291bGQgYmUgd3JvbmcgdG9vKS4KKworICAgICAgICBJbiBjYXNlIG9mIGhhdmluZyBh IGZsZXggY29udGFpbmVyIHdpdGggYSBkZWZpbml0ZSBjcm9zcyBzaXplLCB3ZSBjb3VsZCBhc3N1 bWUgdGhhdCBldmVyeSBzdHJldGNoZWQgZmxleCBpdGVtIHdpdGggYXV0b21hdGljIHNpemUKKyAg ICAgICAgd291bGQgYmUgc3RyZXRjaGVkIHRvIHRoYXQgZGVmaW5pdGUgc2l6ZSAoc2VlIGh0dHBz Oi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jZGVmaW5pdGUtc2l6ZXMpLiBUaGlzIG1l YW5zIHRoYXQgd2UgY2FuCisgICAgICAgIG92ZXJyaWRlIHRoZSBjcm9zcyBzaXplIG9mIHRoZSBp dGVtIGJlZm9yZSBkb2luZyB0aGF0IHByZS1sYXlvdXQuIFRoaXMgd2F5IGl0cyBjaGlsZHJlbiB3 b3VsZCBiZSBsYWlkIG91dCB1c2luZyB0aGUgZmluYWwKKyAgICAgICAgc3RyZXRjaGVkIHNpemUg d2hpY2ggd291bGQgYmUgdGhlIHJpZ2h0IG9uZSB0byB1c2UuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmNvbXB1dGVGbGV4Q29udGFpbmVySW5uZXJDcm9zc1NpemUgY29uc3QpOiBSZWZhY3Rv cmVkIGZyb20gY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoKS4KKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0 aW9Vc2luZyBjb25zdCk6IFVzZSBjb21wdXRlRmxleENvbnRhaW5lcklubmVyQ3Jvc3NTaXplKCku CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEl0ZW1TaG91bGRTdHJl dGNoVG9Db250YWluZXJEZWZpbml0ZUNyb3NzU2l6ZSBjb25zdCk6IGV4dHJhY3RlZCBmcm9tCisg ICAgICAgIGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKCkuCisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91bGRVc2VD b250YWluZXJDcm9zc1NpemUgY29uc3QpOiBVc2UgdGhlIG5ld2x5IGFkZGVkCisgICAgICAgIGZs ZXhJdGVtU2hvdWxkU3RyZXRjaFRvQ29udGFpbmVyRGVmaW5pdGVDcm9zc1NpemUoKQorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVBbmRTZXRDaGlsZE1hcmdpbnNG cm9tU2l6ZSBjb25zdCk6IE5ldyBtZXRob2QgdGhhdCBzZXRzIHRoZSBjaGlsZCBtYXJnaW5zIGlu IHRoZSBtYWluIGF4aXMuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29u c3RydWN0RmxleEl0ZW0pOiBTZXQgYW4gb3ZlcnJpZGluZyBzaXplIGluIHRoZSBjcm9zcyBheGlz IGJlZm9yZSB0aGUgcHJlLWxheW91dCB0byBjb21wdXRlCisgICAgICAgIGludHJpbnNpYyBzaXpl cy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoKKwogMjAyMS0wNC0x OSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIFRoZSBs YXlvdXQgY29udGFpbm1lbnQgYm94IGVzdGFibGlzaGVzIGFuIGFic29sdXRlIHBvc2l0aW9uaW5n IGNvbnRhaW5pbmcgYmxvY2sgYW5kIGEgZml4ZWQgcG9zaXRpb25pbmcgY29udGFpbmluZyBibG9j awpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5k ZXggZGI4MzJhNWIyZWYwZTU0ZGMxMjhlNWExNzViNjkxMTAzYzBmYTY4ZC4uMzFhMTE3NmM1YzU5 MDRkMGFiMjM1MGY4YTMxZjRkNmU5OTk5MDFjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC03NzksNiArNzc5LDE0IEBAIGJvb2wgUmVu ZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGls ZCkKICAgICByZXR1cm4gY2hpbGRDcm9zc1NpemVJc0RlZmluaXRlKGNoaWxkLCBjcm9zc1NpemVM ZW5ndGhGb3JDaGlsZChNYWluT3JQcmVmZXJyZWRTaXplLCBjaGlsZCkpOwogfQogCitMYXlvdXRV bml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleENvbnRhaW5lcklubmVyQ3Jvc3NTaXpl KCkgY29uc3QKK3sKKyAgICBhdXRvIGNvbnRhaW5lckNyb3NzU2l6ZUxlbmd0aCA9IGlzSG9yaXpv bnRhbEZsb3coKSA/IHN0eWxlKCkuaGVpZ2h0KCkgOiBzdHlsZSgpLndpZHRoKCk7CisgICAgLy8g S2VlcCB0aGlzIHN5bmMnZWQgd2l0aCBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNy b3NzU2l6ZSgpLgorICAgIEFTU0VSVChjb250YWluZXJDcm9zc1NpemVMZW5ndGguaXNGaXhlZCgp KTsKKyAgICByZXR1cm4gdmFsdWVGb3JMZW5ndGgoY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoLCAt MV9sdSk7Cit9CisKIC8vIEZJWE1FOiBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2lu ZyBtYXkgbmVlZCB0byByZXR1cm4gYW4gT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW4gdGhlIGZ1dHVy ZQogLy8gcmF0aGVyIHRoYW4gcmV0dXJuaW5nIGluZGVmaW5pdGUgc2l6ZXMgYXMgMC8tMS4KIExh eW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRp b1VzaW5nKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIExlbmd0aCBjcm9zc1NpemVMZW5ndGgpIGNv bnN0CkBAIC04MDEsMTAgKzgwOSw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNv bXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAgICAg IGNyb3NzU2l6ZSA9IGFkanVzdEZvckJveFNpemluZyhjaGlsZCwgY3Jvc3NTaXplTGVuZ3RoKTsK ICAgICBlbHNlIGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRvKCkpIHsKICAgICAgICAgQVNTRVJU KGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSk7Ci0gICAg ICAgIGF1dG8gY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoID0gaXNIb3Jpem9udGFsRmxvdygpID8g c3R5bGUoKS5oZWlnaHQoKSA6IHN0eWxlKCkud2lkdGgoKTsKLSAgICAgICAgLy8gS2VlcCB0aGlz IHN5bmMnZWQgd2l0aCBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZSgp LgotICAgICAgICBBU1NFUlQoY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoLmlzRml4ZWQoKSk7Ci0g ICAgICAgIGNyb3NzU2l6ZSA9IHZhbHVlRm9yTGVuZ3RoKGNvbnRhaW5lckNyb3NzU2l6ZUxlbmd0 aCwgLTFfbHUpOworICAgICAgICBjcm9zc1NpemUgPSBjb21wdXRlRmxleENvbnRhaW5lcklubmVy Q3Jvc3NTaXplKCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJUKGNyb3NzU2l6ZUxlbmd0 aC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSk7CiAgICAgICAgIGNyb3NzU2l6ZSA9IG1haW5BeGlz SXNDaGlsZElubGluZUF4aXMoY2hpbGQpID8gY2hpbGQuY29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2Fs SGVpZ2h0KGNyb3NzU2l6ZUxlbmd0aCkgOiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JC b3hTaXppbmcodmFsdWVGb3JMZW5ndGgoY3Jvc3NTaXplTGVuZ3RoLCBjb250ZW50V2lkdGgoKSks IGNyb3NzU2l6ZUxlbmd0aC50eXBlKCkpOwpAQCAtODU5LDE1ICs4NjQsOCBAQCBib29sIFJlbmRl ckZsZXhpYmxlQm94OjpjaGlsZE1haW5TaXplSXNEZWZpbml0ZShjb25zdCBSZW5kZXJCb3gmIGNo aWxkLCBjb25zdCBMZQogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIFJlbmRlckZsZXhpYmxl Qm94OjpjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjb25zdCBSZW5k ZXJCb3gmIGNoaWxkKSBjb25zdAorYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6ZmxleEl0ZW1TaG91 bGRTdHJldGNoVG9Db250YWluZXJEZWZpbml0ZUNyb3NzU2l6ZShjb25zdCBSZW5kZXJCb3gmIGNo aWxkKSBjb25zdAogewotICAgIGlmICghY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpCi0gICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQo KSAmJiAhY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7Ci0gICAgICAgIC8vIFdlIGNh bid0IGNvbXB1dGUgYSByYXRpbyBpbiB0aGlzIGNhc2UuCi0gICAgICAgIHJldHVybiBmYWxzZTsK LSAgICB9Ci0KICAgICAvLyA5LjggaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94 LyNkZWZpbml0ZS1zaXplcwogICAgIC8vIDEuIElmIGEgc2luZ2xlLWxpbmUgZmxleCBjb250YWlu ZXIgaGFzIGEgZGVmaW5pdGUgY3Jvc3Mgc2l6ZSwgdGhlIGF1dG9tYXRpYyBwcmVmZXJyZWQgb3V0 ZXIgY3Jvc3Mgc2l6ZSBvZiBhbnkKICAgICAvLyBzdHJldGNoZWQgZmxleCBpdGVtcyBpcyB0aGUg ZmxleCBjb250YWluZXIncyBpbm5lciBjcm9zcyBzaXplIChjbGFtcGVkIHRvIHRoZSBmbGV4IGl0 ZW0ncyBtaW4gYW5kIG1heCBjcm9zcyBzaXplKQpAQCAtODgxLDYgKzg3OSwxNyBAQCBib29sIFJl bmRlckZsZXhpYmxlQm94OjpjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6 ZShjb25zdCBSZW5kZXJCbwogICAgIHJldHVybiBmYWxzZTsKIH0KIAorYm9vbCBSZW5kZXJGbGV4 aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY29uc3Qg UmVuZGVyQm94JiBjaGlsZCkgY29uc3QKK3sKKyAgICBpZiAoIWNoaWxkSGFzQXNwZWN0UmF0aW8o Y2hpbGQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFjaGlsZC5pbnRyaW5zaWNT aXplKCkuaGVpZ2h0KCkgJiYgIWNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgeworICAg ICAgICAvLyBXZSBjYW4ndCBjb21wdXRlIGEgcmF0aW8gaW4gdGhpcyBjYXNlLgorICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgfQorICAgIHJldHVybiBmbGV4SXRlbVNob3VsZFN0cmV0Y2hUb0Nv bnRhaW5lckRlZmluaXRlQ3Jvc3NTaXplKGNoaWxkKTsKK30KKwogYm9vbCBSZW5kZXJGbGV4aWJs ZUJveDo6Y2hpbGRDcm9zc1NpemVJc0RlZmluaXRlKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIGNv bnN0IExlbmd0aCYgbGVuZ3RoKQogewogICAgIGlmIChsZW5ndGguaXNBdXRvKCkpCkBAIC0xMjc5 LDggKzEyODgsNDYgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRT aXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY28KICAgICByZXR1cm4gY2hpbGRT aXplOwogfQogCit2b2lkIFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlQW5kU2V0Q2hpbGRNYXJn aW5zRnJvbVNpemUoUmVuZGVyQm94JiBjaGlsZCwgTGF5b3V0VW5pdCBzaXplKSBjb25zdAorewor ICAgIEFTU0VSVCghY2hpbGQuZXZlckhhZExheW91dCgpKTsKKyAgICBpZiAobWFpbkF4aXNJc0No aWxkSW5saW5lQXhpcyhjaGlsZCkpIHsKKyAgICAgICAgY2hpbGQuY29tcHV0ZUFuZFNldEJsb2Nr RGlyZWN0aW9uTWFyZ2lucygqdGhpcyk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBM YXlvdXRVbml0IG1hcmdpblN0YXJ0OworICAgIExheW91dFVuaXQgbWFyZ2luRW5kOworICAgIGNo aWxkLmNvbXB1dGVJbmxpbmVEaXJlY3Rpb25NYXJnaW5zKCp0aGlzLCBzaXplLCBzaXplLCBtYXJn aW5TdGFydCwgbWFyZ2luRW5kKTsKKyAgICBzZXRNYXJnaW5TdGFydEZvckNoaWxkKGNoaWxkLCBt YXJnaW5TdGFydCk7CisgICAgc2V0TWFyZ2luRW5kRm9yQ2hpbGQoY2hpbGQsIG1hcmdpbkVuZCk7 Cit9CisKIEZsZXhJdGVtIFJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4SXRlbShSZW5k ZXJCb3gmIGNoaWxkLCBib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiB7CisgICAgYXV0byBjb25zdHJh aW5CeU1pbk1heCA9IFt0aGlzXShSZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0JiBzaXplKSAt PiB2b2lkIHsKKyAgICAgICAgYXV0byBtaW4gPSBjcm9zc1NpemVMZW5ndGhGb3JDaGlsZChNaW5T aXplLCBjaGlsZCk7CisgICAgICAgIGF1dG8gbWF4ID0gY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQo TWF4U2l6ZSwgY2hpbGQpOworICAgICAgICBpZiAobWF4LmlzRml4ZWQoKSkKKyAgICAgICAgICAg IHNpemUgPSBzdGQ6Om1pbihzaXplLCB2YWx1ZUZvckxlbmd0aChtYXgsIC0xX2x1KSk7CisgICAg ICAgIGlmIChtaW4uaXNGaXhlZCgpKQorICAgICAgICAgICAgc2l6ZSA9IHN0ZDo6bWF4KHNpemUs IHZhbHVlRm9yTGVuZ3RoKG1pbiwgLTFfbHUpKTsKKyAgICB9OworICAgIC8vIFN0cmV0Y2ggaW4g YWR2YW5jZSB0aG9zZSBmbGV4IGl0ZW1zIHRoYXQgd291bGQgYmUgc3RyZXRjaGVkIGxhdGVyIHNv IHRoYXQgd2UgY291bGQgdXNlIHRoYXQKKyAgICAvLyBzdHJldGNoZWQgdmFsdWUgdG8gZGV0ZXJt aW5lIHRoZSBjaGlsZCBpbnRyaW5zaWMgc2l6ZSBhbmQgdGhlIGZsZXggYmFzZSBzaXplLgorICAg IC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jZGVmaW5pdGUtc2l6ZXMK KyAgICBhdXRvIHByZVN0cmV0Y2hGbGV4SXRlbSA9IFt0aGlzLCAmY29uc3RyYWluQnlNaW5NYXhd KFJlbmRlckJveCYgY2hpbGQpIC0+IHZvaWQgeworICAgICAgICBhdXRvIHNpemUgPSBjb21wdXRl RmxleENvbnRhaW5lcklubmVyQ3Jvc3NTaXplKCk7CisgICAgICAgIGlmIChVTkxJS0VMWSghY2hp bGQuZXZlckhhZExheW91dCgpKSkKKyAgICAgICAgICAgIGNvbXB1dGVBbmRTZXRDaGlsZE1hcmdp bnNGcm9tU2l6ZShjaGlsZCwgc2l6ZSk7CisgICAgICAgIHNpemUgPSBzdGQ6Om1heCgwX2x1LCBz aXplIC0gY3Jvc3NBeGlzTWFyZ2luRXh0ZW50Rm9yQ2hpbGQoY2hpbGQpKTsKKyAgICAgICAgY29u c3RyYWluQnlNaW5NYXgoY2hpbGQsIHNpemUpOworICAgICAgICBpZiAobWFpbkF4aXNJc0NoaWxk SW5saW5lQXhpcyhjaGlsZCkpCisgICAgICAgICAgICBjaGlsZC5zZXRPdmVycmlkaW5nTG9naWNh bEhlaWdodChzaXplKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgY2hpbGQuc2V0T3ZlcnJp ZGluZ0xvZ2ljYWxXaWR0aChzaXplKTsKKyAgICB9OworCiAgICAgY2hpbGQuY2xlYXJPdmVycmlk aW5nQ29udGVudFNpemUoKTsKICAgICBpZiAoY2hpbGRIYXNJbnRyaW5zaWNNYWluQXhpc1NpemUo Y2hpbGQpKSB7CiAgICAgICAgIC8vIElmIHRoaXMgY29uZGl0aW9uIGlzIHRydWUsIHRoZW4gY29t cHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQgd2lsbCBjYWxsCkBAIC0xMjk3LDYgKzEzNDQsOCBA QCBGbGV4SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleEl0ZW0oUmVuZGVyQm94 JiBjaGlsZCwgYm9vbCByZWxheW91dENoaQogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAg ICAgIGNoaWxkLnNldE92ZXJyaWRpbmdDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRo KFdURjo6bnVsbG9wdCk7CiAgICAgICAgICAgICBjaGlsZC5jbGVhck92ZXJyaWRpbmdDb250ZW50 U2l6ZSgpOworICAgICAgICAgICAgaWYgKGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1haW5PclBy ZWZlcnJlZFNpemUsIGNoaWxkKS5pc0F1dG8oKSAmJiBmbGV4SXRlbVNob3VsZFN0cmV0Y2hUb0Nv bnRhaW5lckRlZmluaXRlQ3Jvc3NTaXplKGNoaWxkKSkKKyAgICAgICAgICAgICAgICBwcmVTdHJl dGNoRmxleEl0ZW0oY2hpbGQpOwogICAgICAgICAgICAgY2hpbGQuc2V0Q2hpbGROZWVkc0xheW91 dChNYXJrT25seVRoaXMpOwogICAgICAgICAgICAgY2hpbGQubGF5b3V0SWZOZWVkZWQoKTsKICAg ICAgICAgICAgIGNhY2hlQ2hpbGRNYWluU2l6ZShjaGlsZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCmluZGV4IGM2NmM5MTE2NmZjZTRkNTQ1OGFmN2Ux OWU1NDk1YTgzNTdkMDgxMmUuLmYzN2ExOGYxOWFjZTU3OTFiMWFlOTU3N2U5NDNmODVmMmQ0ZTcz MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBA IC0xNDMsNyArMTQzLDkgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IGNyb3NzQXhpc1Njcm9s bGJhckV4dGVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIExh eW91dFBvaW50IGZsb3dBd2FyZUxvY2F0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGls ZCkgY29uc3Q7CiAgICAgYm9vbCB1c2VDaGlsZEFzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYg Y2hpbGQpOworICAgIGJvb2wgZmxleEl0ZW1TaG91bGRTdHJldGNoVG9Db250YWluZXJEZWZpbml0 ZUNyb3NzU2l6ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKICAgICBib29sIGNoaWxk Q3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJveCYgY2hp bGQpIGNvbnN0OworICAgIExheW91dFVuaXQgY29tcHV0ZUZsZXhDb250YWluZXJJbm5lckNyb3Nz U2l6ZSgpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJh dGlvVXNpbmcoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNyb3NzU2l6ZUxlbmd0aCkg Y29uc3Q7CiAgICAgdm9pZCBzZXRGbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKFJlbmRlckJveCYg Y2hpbGQsIGNvbnN0IExheW91dFBvaW50Jik7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlSW5uZXJG bGV4QmFzZVNpemVGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0IG1haW5BeGlz Qm9yZGVyQW5kUGFkZGluZyk7CkBAIC0xNzUsNiArMTc3LDcgQEAgcHJpdmF0ZToKICAgICB2b2lk IHByZXBhcmVPcmRlckl0ZXJhdG9yQW5kTWFyZ2lucygpOwogICAgIExheW91dFVuaXQgYWRqdXN0 Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIExheW91dFVuaXQg Y2hpbGRTaXplKTsKICAgICBMYXlvdXRVbml0IGFkanVzdENoaWxkU2l6ZUZvckFzcGVjdFJhdGlv Q3Jvc3NBeGlzTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIExheW91dFVuaXQgY2hp bGRTaXplKTsKKyAgICB2b2lkIGNvbXB1dGVBbmRTZXRDaGlsZE1hcmdpbnNGcm9tU2l6ZShSZW5k ZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0KSBjb25zdDsKICAgICBGbGV4SXRlbSBjb25zdHJ1Y3RG bGV4SXRlbShSZW5kZXJCb3gmLCBib29sIHJlbGF5b3V0Q2hpbGRyZW4pOwogICAgIAogICAgIHZv aWQgZnJlZXplSW5mbGV4aWJsZUl0ZW1zKEZsZXhTaWduLCBWZWN0b3I8RmxleEl0ZW0+JiBjaGls ZHJlbiwgTGF5b3V0VW5pdCYgcmVtYWluaW5nRnJlZVNwYWNlLCBkb3VibGUmIHRvdGFsRmxleEdy b3csIGRvdWJsZSYgdG90YWxGbGV4U2hyaW5rLCBkb3VibGUmIHRvdGFsV2VpZ2h0ZWRGbGV4U2hy aW5rKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCAwODQ0ZjQxYzE4ODJhYzJhNWI2ZGIzOWQ5NGM0MWNlNTkzYTk2YmFlLi41 MGU4N2MxZjlhZDFjYjQ3YWYwMWEzNTMzOTEyOWJiNmNmMGY3MmZjIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTIgQEAKKzIwMjEtMDQtMTkgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5j b20+CisKKyAgICAgICAgRm9yIGZsZXggYm94IGl0ZW1zLCBtYXJnaW5zIGFuZCBwYWRkaW5nIHNo b3VsZCByZXNvbHZlIGFnYWluc3QgdGhlaXIgcmVzcGVjdGl2ZSBkaW1lbnNpb25zLCBub3QgYWx3 YXlzIGNvbnRhaW5pbmcgYmxvY2sgd2lkdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0NTE3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczogVW5za2lwcGVkIGEgdGVzdCB0 aGF0IGlzIG5vdyBwYXNzaW5nLgorCiAyMDIxLTA0LTE5ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5v cm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBXUEUgZ2FyZGVuaW5nCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVz dEV4cGVjdGF0aW9ucwppbmRleCA2Y2ZjNjU2YzJiNDEwZjQ0NTY4NjViMzcxM2JjMjgzNDkxMzQz ZTQ4Li4yYzU3YTZjNTI1NTdiMDJiNmI3YTQzNmNiNmM4ZWE2NWE0YjljMTY3IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBl Y3RhdGlvbnMKQEAgLTM5MDMsNyArMzkwMyw2IEBAIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtCiB3 ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1mbGV4Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDEwLmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMTMuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQogCi13ZWJraXQub3JnL2IvMTQ1MTc2IGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXhib3hfYWxpZ24taXRlbXMtc3Ry ZXRjaC0zLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTAwOTMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvc2VsZWN0LWVsZW1l bnQtemVyby1oZWlnaHQtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv Yi8yMTAxNDQgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gv YW5vbnltb3VzLWZsZXgtaXRlbS0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxMDQ3OCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxl eGJveC9wZXJjZW50YWdlLWhlaWdodHMtMDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K 442407 2021-10-25 13:44:53 -0700 2022-01-25 02:03:09 -0800 Patch bug-145176-20211025224451.patch text/plain 12505 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI0NDI5OThkMzJkYTEy Yjg2YmUxMjFhZTVmMjViOTY0NDFhMjBmZS4uZmVjMDZjZjRhYmNjNzgwM2RkNzU2NWYwMWIxYzNi OGM1MDYzMzljMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTEwLTI1ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIEZvciBmbGV4 IGJveCBpdGVtcywgbWFyZ2lucyBhbmQgcGFkZGluZyBzaG91bGQgcmVzb2x2ZSBhZ2FpbnN0IHRo ZWlyIHJlc3BlY3RpdmUgZGltZW5zaW9ucywgbm90IGFsd2F5cyBjb250YWluaW5nIGJsb2NrIHdp ZHRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDUx NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVu IGNvbXB1dGluZyB0aGUgZmxleCBiYXNlIHNpemUgbWlufG1heCBzaXplIGNvbnN0cmFpbnRzIGlu IHRoZSBmbGV4IGl0ZW0gYXJlIGdlbmVyYWxseSBpZ25vcmVkLiBIb3dldmVyCisgICAgICAgIHdo ZW4gdGhlIHN0cmV0Y2hlZCBjcm9zcyBzaXplIGlzIGRldGVybWluZWQgYnkgdGhlIGNvbnRhaW5l ciAoYmFzaWNhbGx5IHdoZW4gdGhlIGl0ZW0gc3RyZXRjaGVzIGFuZCB0aGUgZmxleAorICAgICAg ICBjb250YWluZXIgaGFzIGEgZGVmaW5pdGUgc2l6ZSBpbiB0aGUgY3Jvc3MgYXhpcykgdGhvc2Ug Y29uc3RyYWlucyBzaG91bGQgYmUgdGFrZW4gaW50byBhY2NvdW50LgorCisgICAgICAgIEZpeGlu ZyB0aGlzIGNhc2UgcmVxdWlyZWQgdHdvIGNoYW5nZXM6CisgICAgICAgIDEuIHNwbGl0IHRoZSBT Y29wZWRVbmJvdW5kZWRCb3hXaXRoRmxleEJhc2lzQXNDaGlsZE1haW5TaXplIFJBSUkgY2xhc3Mg aW4gdHdvOiBvbmUgdGhhdCB0ZW1wb3JhcmlseQorICAgICAgICByZW1vdmVzIHRoZSBtaW58bWF4 IGNvbnN0cmFpbnMgYW5kIHRoZSBvdGhlciB3aGljaCBzZXRzIHRoZSBmbGV4IGJhc2Ugc2l6ZSBh cyB0aGUgaXRlbSBtYWluIHNpemUuCisgICAgICAgIDIuIGFwcGx5IHRoZSBmbGV4IGl0ZW0gbWlu fG1heCBjb25zdHJhaW5zIHRvIHRoZSBmbGV4IGNvbnRhaW5lcidzIGNyb3NzIHNpemUgd2hlbmV2 ZXIgd2UgaGF2ZSB0byB1c2UgaXQKKyAgICAgICAgYXMgdGhlIGl0ZW0gc3RyZXRjaGVkIHNpemUg KGJhc2ljYWxseSB3aGVuIGl0J3MgZGVmaW5pdGUgYW5kIHRoZSBpdGVtIG1lZXRzIHRoZSBjb25k aXRpb25zIHRvIHN0cmV0Y2gpLgorCisgICAgICAgIFRoZSBzcGxpdCBpbiAxLiB3YXMgcmVxdWly ZWQgcHJlY2lzZWx5IGJlY2F1c2UgaW4gdGhpcyBwYXJ0aWN1bGFyIGNhc2UsIHdlIG5lZWQgdG8g YmUgdW5kZXIgdGhlIHNjb3BlIG9mCisgICAgICAgIFNjb3BlZEZsZXhCYXNpc0FzQ2hpbGRNYWlu U2l6ZSBidXQgbm90IHVuZGVyIFNjb3BlZFVuYm91bmRlZEJveC4gQmVmb3JlIHRoaXMgcGF0Y2gg Ym90aCBzY29wZXMgd2VyZSBhcHBsaWVkCisgICAgICAgIGF0IHRoZSBzYW1lIHRpbWUgYXMgYm90 aCBiZWhhdmlvdXJzIHdlcmUgaW1wbGVtZW50ZWQgaW4gdGhlIHNhbWUgUkFJSSBjbGFzcy4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJD cm9zc1NpemUgY29uc3QpOiBGaXhlZCByZWZlcmVuY2UgdG8gc3BlY3MuCisgICAgICAgIChXZWJD b3JlOjpTY29wZWRVbmJvdW5kZWRCb3g6OlNjb3BlZFVuYm91bmRlZEJveCk6IFJBSUkgY2xhc3Mg dGhhdCB0ZW1wb3JhcmlseSBkaXNhYmxlcyBtaW58bWF4IGNvbnN0cmFpbnMuCisgICAgICAgIChX ZWJDb3JlOjpTY29wZWRVbmJvdW5kZWRCb3g6On5TY29wZWRVbmJvdW5kZWRCb3gpOgorICAgICAg ICAoV2ViQ29yZTo6U2NvcGVkRmxleEJhc2lzQXNDaGlsZE1haW5TaXplOjpTY29wZWRGbGV4QmFz aXNBc0NoaWxkTWFpblNpemUpOiBSQUlJIGNsYXNzIHRoYXQgdGVtcG9yYXJpbHkgc2V0cworICAg ICAgICB0aGUgdmFsdWUgb2YgZmxleC1iYXNpcyBhcyB0aGUgaXRlbSdzIG1haW4gc2l6ZS4KKyAg ICAgICAgKFdlYkNvcmU6OlNjb3BlZEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZTo6flNjb3BlZEZs ZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJs ZUJveDo6Y29tcHV0ZUZsZXhCYXNlU2l6ZUZvckNoaWxkKTogRG8gbm90IHJlbW92ZSB0aGUgbWlu fG1heCBjb25zdHJhaW5zIHdoZW4gY29tcHV0aW5nCisgICAgICAgIHRoZSBmbGV4IGl0ZW0gY3Jv c3Mgc2l6ZSBmcm9tIHRoZSBjb250YWluZXIncyBjcm9zcyBzaXplLgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVDcm9zc1NpemVGb3JDaGlsZFVzaW5nQ29udGFp bmVyQ3Jvc3NTaXplIGNvbnN0KTogQWx3YXlzIGNsYW1wIHRoZSByZXR1cm5lZAorICAgICAgICBz aXplIGJ5IHRoZSBpdGVtJ3MgbWlufG1heCBjb25zdHJhaW5zLgorICAgICAgICAoV2ViQ29yZTo6 U2NvcGVkVW5ib3VuZGVkQm94V2l0aEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZTo6U2NvcGVkVW5i b3VuZGVkQm94V2l0aEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZSk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpTY29wZWRVbmJvdW5kZWRCb3hXaXRoRmxleEJhc2lzQXNDaGlsZE1haW5TaXpl Ojp+U2NvcGVkVW5ib3VuZGVkQm94V2l0aEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZSk6IERlbGV0 ZWQuCisKIDIwMjEtMTAtMjUgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0 Lm9yZz4KIAogICAgICAgICBXZWJLaXQgb3VnaHQgdG8gYmUgYWJsZSB0byBwbGF5IHZpZGVvcyB3 aXRob3V0IENvbnRlbnQtTGVuZ3RoIEhUVFAgaGVhZGVyIGZpZWxkcyBhbmQgd2l0aG91dCByYW5n ZSBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94 LmNwcAppbmRleCBmZDUxODliNTdmZGQ0NWNmNDFjNDY0Mjc1YTAxMjQzYTU3M2YzYzA0Li4yYmUy NDUxM2I1ZmY4MGYxYjI1ZDhkYmMzNmNmODA4NjZmOGNiM2Y1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTk0NCw3ICs5NDQsNyBAQCBi b29sIFJlbmRlckZsZXhpYmxlQm94OjpjaGlsZEhhc0NvbXB1dGFibGVBc3BlY3RSYXRpb0FuZENy b3NzU2l6ZUlzQ29uc2lkZXJlZERlZgogYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9z c1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkg Y29uc3QKIHsKICAgICAvLyA5LjggaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94 LyNkZWZpbml0ZS1zaXplcwotICAgIC8vIDEuIElmIGEgc2luZ2xlLWxpbmUgZmxleCBjb250YWlu ZXIgaGFzIGEgZGVmaW5pdGUgY3Jvc3Mgc2l6ZSwgdGhlIGF1dG9tYXRpYyBwcmVmZXJyZWQgb3V0 ZXIgY3Jvc3Mgc2l6ZSBvZiBhbnkKKyAgICAvLyAzLiBJZiBhIHNpbmdsZS1saW5lIGZsZXggY29u dGFpbmVyIGhhcyBhIGRlZmluaXRlIGNyb3NzIHNpemUsIHRoZSBhdXRvbWF0aWMgcHJlZmVycmVk IG91dGVyIGNyb3NzIHNpemUgb2YgYW55CiAgICAgLy8gc3RyZXRjaGVkIGZsZXggaXRlbXMgaXMg dGhlIGZsZXggY29udGFpbmVyJ3MgaW5uZXIgY3Jvc3Mgc2l6ZSAoY2xhbXBlZCB0byB0aGUgZmxl eCBpdGVtJ3MgbWluIGFuZCBtYXggY3Jvc3Mgc2l6ZSkKICAgICAvLyBhbmQgaXMgY29uc2lkZXJl ZCBkZWZpbml0ZS4KICAgICBpZiAoIWlzTXVsdGlsaW5lKCkgJiYgYWxpZ25tZW50Rm9yQ2hpbGQo Y2hpbGQpID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCAmJiAhaGFzQXV0b01hcmdpbnNJbkNyb3Nz QXhpcyhjaGlsZCkgJiYgY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWFpbk9yUHJlZmVycmVkU2l6 ZSwgY2hpbGQpLmlzQXV0bygpKSB7CkBAIC05OTgsMTUgKzk5OCwxMyBAQCB2b2lkIFJlbmRlckZs ZXhpYmxlQm94OjpjbGVhckNhY2hlZE1haW5TaXplRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBj aGlsZCkKICAgICBtX2ludHJpbnNpY1NpemVBbG9uZ01haW5BeGlzLnJlbW92ZSgmY2hpbGQpOwog fQogCi0vLyBUaGlzIGlzIGEgUkFJSSBjbGFzcyB0aGF0IGlzIHVzZWQgdG8gdGVtcG9yYXJpbHkg c2V0IHRoZSBmbGV4IGJhc2lzIGFzIHRoZSBjaGlsZCBzaXplIGluIHRoZSBtYWluIGF4aXMuIEFw YXJ0IGZyb20gdGhhdAotLy8gdGhlIG1pbnxtYXgtc2l6ZSByZXN0cmljdGlvbnMgYXJlIGlnbm9y ZWQgZm9yIHRoaXMgY29tcHV0YXRpb24uIFNlZSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3Nz LWZsZXhib3gvI2FsZ28tbWFpbi1pdGVtCi0vLyBmb3IgZnVydGhlciBkZXRhaWxzLgotY2xhc3Mg U2NvcGVkVW5ib3VuZGVkQm94V2l0aEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZSB7CisvLyBUaGlz IGlzIGEgUkFJSSBjbGFzcyB0aGF0IHRlbXBvcmFyaWx5IHJlbW92ZXMgdGhlIG1pbnxtYXgtc2l6 ZSBjb25zdHJhaW5zLCB1c2VkIHRvIGNvbXB1dGUgdGhlIGZsZXggYmFzZSBzaXplLgorLy8gU2Vl IGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0ZW0gZm9y IGZ1cnRoZXIgZGV0YWlscy4KK2NsYXNzIFNjb3BlZFVuYm91bmRlZEJveCB7CiBwdWJsaWM6Ci0g ICAgU2NvcGVkVW5ib3VuZGVkQm94V2l0aEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZShSZW5kZXJC b3gmIGNoaWxkLCBMZW5ndGggZmxleEJhc2lzLCBib29sIG1haW5BeGlzSXNJbmxpbmVBeGlzKQor ICAgIFNjb3BlZFVuYm91bmRlZEJveChSZW5kZXJCb3gmIGNoaWxkLCBib29sIG1haW5BeGlzSXNJ bmxpbmVBeGlzKQogICAgICAgICA6IG1fY2hpbGQoY2hpbGQpCiAgICAgICAgICwgbV9pc0hvcml6 b250YWxXcml0aW5nTW9kZUluUGFyYWxsZWxGbG93KG1haW5BeGlzSXNJbmxpbmVBeGlzID09IGNo aWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCi0gICAgICAgICwgbV9tYWluQXhpc0lzSW5s aW5lQXhpcyhtYWluQXhpc0lzSW5saW5lQXhpcykKICAgICB7CiAgICAgICAgIGlmIChtX2lzSG9y aXpvbnRhbFdyaXRpbmdNb2RlSW5QYXJhbGxlbEZsb3cpIHsKICAgICAgICAgICAgIG1fb3JpZ2lu YWxNaW5TaXplID0gbV9jaGlsZC5zdHlsZSgpLm1pbldpZHRoKCk7CkBAIC0xMDE5LDE2ICsxMDE3 LDggQEAgcHVibGljOgogICAgICAgICAgICAgbV9jaGlsZC5tdXRhYmxlU3R5bGUoKS5zZXRNaW5I ZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxNaW5TaXplKCkpOwogICAgICAgICAgICAgbV9jaGls ZC5tdXRhYmxlU3R5bGUoKS5zZXRNYXhIZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxNYXhTaXpl KCkpOwogICAgICAgICB9Ci0KLSAgICAgICAgaWYgKG1fbWFpbkF4aXNJc0lubGluZUF4aXMpIHsK LSAgICAgICAgICAgIG1fb3JpZ2luYWxTaXplID0gbV9jaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0 aCgpOwotICAgICAgICAgICAgbV9jaGlsZC5tdXRhYmxlU3R5bGUoKS5zZXRMb2dpY2FsV2lkdGgo TGVuZ3RoKGZsZXhCYXNpcykpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAg ICAgIG1fb3JpZ2luYWxTaXplID0gbV9jaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKLSAg ICAgICAgbV9jaGlsZC5tdXRhYmxlU3R5bGUoKS5zZXRMb2dpY2FsSGVpZ2h0KExlbmd0aChmbGV4 QmFzaXMpKTsKICAgICB9Ci0gICAgflNjb3BlZFVuYm91bmRlZEJveFdpdGhGbGV4QmFzaXNBc0No aWxkTWFpblNpemUoKQorICAgIH5TY29wZWRVbmJvdW5kZWRCb3goKQogICAgIHsKICAgICAgICAg aWYgKG1faXNIb3Jpem9udGFsV3JpdGluZ01vZGVJblBhcmFsbGVsRmxvdykgewogICAgICAgICAg ICAgbV9jaGlsZC5tdXRhYmxlU3R5bGUoKS5zZXRNaW5XaWR0aChMZW5ndGgobV9vcmlnaW5hbE1p blNpemUpKTsKQEAgLTEwMzcsNyArMTAyNywzMyBAQCBwdWJsaWM6CiAgICAgICAgICAgICBtX2No aWxkLm11dGFibGVTdHlsZSgpLnNldE1pbkhlaWdodChMZW5ndGgobV9vcmlnaW5hbE1pblNpemUp KTsKICAgICAgICAgICAgIG1fY2hpbGQubXV0YWJsZVN0eWxlKCkuc2V0TWF4SGVpZ2h0KExlbmd0 aChtX29yaWdpbmFsTWF4U2l6ZSkpOwogICAgICAgICB9CisgICAgfQogCitwcml2YXRlOgorICAg IFJlbmRlckJveCYgbV9jaGlsZDsKKyAgICBib29sIG1faXNIb3Jpem9udGFsV3JpdGluZ01vZGVJ blBhcmFsbGVsRmxvdzsKKyAgICBMZW5ndGggbV9vcmlnaW5hbE1pblNpemU7CisgICAgTGVuZ3Ro IG1fb3JpZ2luYWxNYXhTaXplOworfTsKKworLy8gVGhpcyBpcyBhIFJBSUkgY2xhc3MgdGhhdCBp cyB1c2VkIHRvIHRlbXBvcmFyaWx5IHNldCB0aGUgZmxleCBiYXNpcyBhcyB0aGUgY2hpbGQgc2l6 ZSBpbiB0aGUgbWFpbiBheGlzLgorLy8gU2VlIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mt ZmxleGJveC8jYWxnby1tYWluLWl0ZW0gZm9yIGZ1cnRoZXIgZGV0YWlscy4KK2NsYXNzIFNjb3Bl ZEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZSB7CitwdWJsaWM6CisgICAgU2NvcGVkRmxleEJhc2lz QXNDaGlsZE1haW5TaXplKFJlbmRlckJveCYgY2hpbGQsIExlbmd0aCBmbGV4QmFzaXMsIGJvb2wg bWFpbkF4aXNJc0lubGluZUF4aXMpCisgICAgICAgIDogbV9jaGlsZChjaGlsZCkKKyAgICAgICAg LCBtX21haW5BeGlzSXNJbmxpbmVBeGlzKG1haW5BeGlzSXNJbmxpbmVBeGlzKQorICAgIHsKKyAg ICAgICAgaWYgKG1fbWFpbkF4aXNJc0lubGluZUF4aXMpIHsKKyAgICAgICAgICAgIG1fb3JpZ2lu YWxTaXplID0gbV9jaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpOworICAgICAgICAgICAgbV9j aGlsZC5tdXRhYmxlU3R5bGUoKS5zZXRMb2dpY2FsV2lkdGgoTGVuZ3RoKGZsZXhCYXNpcykpOwor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIG1fb3JpZ2luYWxTaXplID0g bV9jaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAgbV9jaGlsZC5tdXRhYmxl U3R5bGUoKS5zZXRMb2dpY2FsSGVpZ2h0KExlbmd0aChmbGV4QmFzaXMpKTsKKyAgICB9CisgICAg flNjb3BlZEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZSgpCisgICAgewogICAgICAgICBpZiAobV9t YWluQXhpc0lzSW5saW5lQXhpcykKICAgICAgICAgICAgIG1fY2hpbGQubXV0YWJsZVN0eWxlKCku c2V0TG9naWNhbFdpZHRoKExlbmd0aChtX29yaWdpbmFsU2l6ZSkpOwogICAgICAgICBlbHNlCkBA IC0xMDQ1LDExICsxMDYxLDggQEAgcHVibGljOgogICAgIH0KIHByaXZhdGU6CiAgICAgUmVuZGVy Qm94JiBtX2NoaWxkOwotICAgIGJvb2wgbV9pc0hvcml6b250YWxXcml0aW5nTW9kZUluUGFyYWxs ZWxGbG93OwogICAgIGJvb2wgbV9tYWluQXhpc0lzSW5saW5lQXhpczsKICAgICBMZW5ndGggbV9v cmlnaW5hbFNpemU7Ci0gICAgTGVuZ3RoIG1fb3JpZ2luYWxNaW5TaXplOwotICAgIExlbmd0aCBt X29yaWdpbmFsTWF4U2l6ZTsKIH07CiAKIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mt ZmxleGJveC8jYWxnby1tYWluLWl0ZW0KQEAgLTEwNzEsMTMgKzEwODQsMjggQEAgTGF5b3V0VW5p dCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUZsZXhCYXNlU2l6ZUZvckNoaWxkKFJlbmRlckJv eCYgY2hpbGQsIExheW8KIAogICAgIC8vIDkuMy4yIEUuIE90aGVyd2lzZSwgc2l6ZSB0aGUgaXRl bSBpbnRvIHRoZSBhdmFpbGFibGUgc3BhY2UgdXNpbmcgaXRzIHVzZWQgZmxleCBiYXNpcyBpbiBw bGFjZSBvZiBpdHMgbWFpbiBzaXplLgogICAgIHsKLSAgICAgICAgU2NvcGVkVW5ib3VuZGVkQm94 V2l0aEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZSBmbGV4QmFzaXNTY29wZShjaGlsZCwgZmxleEJh c2lzLmlzQ29udGVudCgpID8gTGVuZ3RoKExlbmd0aFR5cGU6Ok1heENvbnRlbnQpIDogZmxleEJh c2lzLCBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSk7Ci0gICAgICAgIGlmIChtYWlu QXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSkKKyAgICAgICAgYXV0byBpc01haW5BeGlzQ2hp bGRJbmxpbmVBeGlzID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCk7CisgICAgICAg IFNjb3BlZEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZSBmbGV4QmFzaXNTY29wZShjaGlsZCwgZmxl eEJhc2lzLmlzQ29udGVudCgpID8gTGVuZ3RoKExlbmd0aFR5cGU6Ok1heENvbnRlbnQpIDogZmxl eEJhc2lzLCBpc01haW5BeGlzQ2hpbGRJbmxpbmVBeGlzKTsKKyAgICAgICAgaWYgKG1haW5BeGlz SXNDaGlsZElubGluZUF4aXMoY2hpbGQpKSB7CisgICAgICAgICAgICBTY29wZWRVbmJvdW5kZWRC b3ggbm9NaW5NYXhDb25zdHJhaW50c0ZvckNoaWxkKGNoaWxkLCBpc01haW5BeGlzQ2hpbGRJbmxp bmVBeGlzKTsKICAgICAgICAgICAgIHJldHVybiBjaGlsZC5tYXhQcmVmZXJyZWRMb2dpY2FsV2lk dGgoKSAtIG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZzsKKyAgICAgICAgfQogCiAgICAgICAgIGlm IChjaGlsZEhhc0ludHJpbnNpY01haW5BeGlzU2l6ZShjaGlsZCkpCiAgICAgICAgICAgICBjaGls ZC5zZXROZWVkc0xheW91dChNYXJrT25seVRoaXMpOwotICAgICAgICBjaGlsZC5sYXlvdXRJZk5l ZWRlZCgpOworCisgICAgICAgIC8vIFdoZW4gdXNpbmcgdGhlIGNvbnRhaW5lciBjcm9zcyBzaXpl IHdlIHNob3VsZCBzdGlsbCBhcHBseSB0aGUgY2hpbGQncyBtaW58bWF4IGNvbnN0cmFpbnMuIEFs c28gdGhpcyBwYXRoCisgICAgICAgIC8vIHNob3VsZCBub3QgYmUgdGFrZW4gaW4gY2FzZSBvZiBo YXZpbmcgYW4gYXNwZWN0IHJhdGlvIG9yIHdoZW4gdGhlIGZsZXggY29udGFpbmVyIGlzIGEgZmxl eCBpdGVtIChhcyB0aGUgcGFyZW50CisgICAgICAgIC8vIG1heSBoYXZlIGFscmVhZHkgZmxleGVk IHVzKS4KKyAgICAgICAgaWYgKGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NT aXplKGNoaWxkKSAmJiAhY2hpbGRIYXNDb21wdXRhYmxlQXNwZWN0UmF0aW8oY2hpbGQpICYmICFp c0ZsZXhJdGVtKCkpIHsKKyAgICAgICAgICAgIGF1dG8gYXhpcyA9IGlzTWFpbkF4aXNDaGlsZElu bGluZUF4aXMgPyBPdmVycmlkaW5nU2l6ZXNTY29wZTo6QXhpczo6QmxvY2sgOiBPdmVycmlkaW5n U2l6ZXNTY29wZTo6QXhpczo6SW5saW5lOworICAgICAgICAgICAgT3ZlcnJpZGluZ1NpemVzU2Nv cGUgb3ZlcnJpZGluZ1NpemVTY29wZShjaGlsZCwgYXhpcywgY29tcHV0ZUNyb3NzU2l6ZUZvckNo aWxkVXNpbmdDb250YWluZXJDcm9zc1NpemUoY2hpbGQpKTsKKyAgICAgICAgICAgIGNoaWxkLmxh eW91dElmTmVlZGVkKCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBTY29wZWRVbmJv dW5kZWRCb3ggbm9NaW5NYXhDb25zdHJhaW50c0ZvckNoaWxkKGNoaWxkLCBpc01haW5BeGlzQ2hp bGRJbmxpbmVBeGlzKTsKKyAgICAgICAgICAgIGNoaWxkLmxheW91dElmTmVlZGVkKCk7CisgICAg ICAgIH0KKwogICAgICAgICByZXR1cm4gY2hpbGQubG9naWNhbEhlaWdodCgpIC0gbWFpbkF4aXNC b3JkZXJBbmRQYWRkaW5nOwogICAgIH0KIH0KQEAgLTE3MjYsNyArMTc1NCwxMiBAQCBMYXlvdXRV bml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlQ3Jvc3NTaXplRm9yQ2hpbGRVc2luZ0NvbnRh aW5lckNyb3NzU2l6ZShjbwogCiAgICAgICAgIHJldHVybiBkZWZpbml0ZVZhbHVlOwogICAgIH07 Ci0gICAgcmV0dXJuIHN0ZDo6bWF4KDBfbHUsIGRlZmluaXRlU2l6ZVZhbHVlKCkgLSBjcm9zc0F4 aXNNYXJnaW5FeHRlbnRGb3JDaGlsZChjaGlsZCkpOworICAgIGF1dG8gY29uc3RyYWluQ3Jvc3NT aXplID0gW3RoaXNdKExheW91dFVuaXQgY3Jvc3NTaXplLCBjb25zdCBSZW5kZXJCb3gmIGNoaWxk KSB7CisgICAgICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCisgICAgICAgICAgICByZXR1cm4g Y2hpbGQuY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KGNyb3NzU2l6ZSwgc3RkOjpudWxs b3B0KTsKKyAgICAgICAgcmV0dXJuIGNoaWxkLmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21l bnRCeU1pbk1heChjcm9zc1NpemUsIGNoaWxkLmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCgpLCBjb25z dF9jYXN0PFJlbmRlckZsZXhpYmxlQm94Jj4oKnRoaXMpLCBudWxscHRyKTsKKyAgICB9OworICAg IHJldHVybiBjb25zdHJhaW5Dcm9zc1NpemUoZGVmaW5pdGVTaXplVmFsdWUoKSAtIGNyb3NzQXhp c01hcmdpbkV4dGVudEZvckNoaWxkKGNoaWxkKSwgY2hpbGQpOwogfQogCiB2b2lkIFJlbmRlckZs ZXhpYmxlQm94OjpwcmVwYXJlQ2hpbGRGb3JQb3NpdGlvbmVkTGF5b3V0KFJlbmRlckJveCYgY2hp bGQpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggZTQ4YzgwOTZkNmIxYTEyYTU1ZGM3Nzc3MzcwYzljOGM3MTJhNDYyMi4uN2Ez YzEyMWVlYWE1MGU2MTUwYjE2YzA2YTkxM2M3M2ExNGFmNTZmMCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDIxLTEwLTI1ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29t PgorCisgICAgICAgIEZvciBmbGV4IGJveCBpdGVtcywgbWFyZ2lucyBhbmQgcGFkZGluZyBzaG91 bGQgcmVzb2x2ZSBhZ2FpbnN0IHRoZWlyIHJlc3BlY3RpdmUgZGltZW5zaW9ucywgbm90IGFsd2F5 cyBjb250YWluaW5nIGJsb2NrIHdpZHRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDUxNzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6IFVuc2tpcHBlZCBmbGV4Ym94X2Fs aWduLWl0ZW1zLXN0cmV0Y2gtMy5odG1sIHdoaWNoIGlzIG5vdyBwYXNzaW5nLgorCiAyMDIxLTEw LTI1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgUmVncmVzc2lv biAocjI4NDYxMCk6IFsgaU9TIEJpZ1N1ciB3azIgXSBodHRwL3Rlc3RzL3NlY3VyaXR5L3dpbmRv dy1vcGVuZWQtZnJvbS1zYW5kYm94ZWQtaWZyYW1lLXNob3VsZC1pbmhlcml0LXNhbmRib3guaHRt bCBpcyBmYWlsaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIv TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBmYTBmMDIyNjNmNjExYmJhYjM0Nzll YmY5MGNhYTkxZGI4ZWRkNDRhLi40YWI0NWJmMGM5OWE1MTU5NWFkNDU2NmI4MTRiMWNjNjQwYWJm OGViIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91 dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQyODgsNyArNDI4OCw2IEBAIHdlYmtpdC5vcmcv Yi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gv ZmxleC1hc3BlY3QtCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDEwLmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNp Yy1zaXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8xNDUx NzYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleGJv eF9hbGlnbi1pdGVtcy1zdHJldGNoLTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxMDA5MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxl eGJveC9zZWxlY3QtZWxlbWVudC16ZXJvLWhlaWdodC0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogd2Via2l0Lm9yZy9iLzIxMDA5MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtZmxleGJveC9zZWxlY3QtZWxlbWVudC16ZXJvLWhlaWdodC0wMDIuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxMDE0NCBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hbm9ueW1vdXMtZmxleC1pdGVtLTAwNS5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==