227627 2021-07-02 07:51:31 -0700 [LFC][TFC] Add support for priority list of width types when expanding columns 2021-07-03 07:18:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1774460 0 zalan 2021-07-02 07:51:31 -0700 expanding priority list is as follows: fixed percent relative auto 1774464 1 432795 zalan 2021-07-02 07:57:18 -0700 Created attachment 432795 Patch 1774642 2 432840 zalan 2021-07-02 21:20:48 -0700 Created attachment 432840 Patch 1774665 3 432850 zalan 2021-07-03 06:21:54 -0700 Created attachment 432850 Patch 1774668 4 ews-feeder 2021-07-03 07:17:45 -0700 Committed r279543 (239379@main): <https://commits.webkit.org/239379@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432850. 1774669 5 webkit-bug-importer 2021-07-03 07:18:18 -0700 <rdar://problem/80127101> 432795 2021-07-02 07:57:18 -0700 2021-07-02 21:20:46 -0700 Patch bug-227627-20210702075718.patch text/plain 12796 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzUzNDg2NGNiMTE0ZTBi ZWNhYzc5ZjIzM2YxM2MyOWE1NTYyZDRmMi4uMGM0OTc4YjQzNThmMGQ4NTNjZWM0YzM5OTJlYjlk YWUwN2I5NmM2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA3LTAyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIEFkZCBzdXBw b3J0IGZvciBwcmlvcml0eSBsaXN0IG9mIHdpZHRoIHR5cGVzIHdoZW4gZXhwYW5kaW5nIGNvbHVt bnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzYy NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4g ZXhwYW5kaW5nIHRoZSBjb2x1bW5zIHRvIHVzZSB0aGUgZXh0cmEgc3BhY2UgYXZhaWxhYmxlLCB3 ZSBuZWVkIHRvIHByaW9yaXRpemUgY2VydGFpbiBjb2x1bW5zCisgICAgICAgIHdpdGggc3BlY2lm aWMgd2lkdGggdHlwZXM6IGZpeGVkID4gcGVyY2VudCA+IHJlbGF0aXZlID4gYXV0bworICAgICAg ICBUaGlzIGlzIF9hbG1vc3RfIHRoZSByZXZlcnNlZCB2ZXJzaW9uIG9mIHRoZSBzaHJpbmtpbmcg cHJpb3JpdHkgbGlzdCAoYnV0IG5vdCBxdWl0ZSkuCisgICAgICAgIE5vdyB3ZSBjYW4gaGF2ZSBt aXhlZCBjb2x1bW4gdHlwZXMgYWNyb3NzIG11bHRpcGxlIHJvd3Mgd2l0aCBleHBhbmRpbmcgYW5k IHNocmlua2luZyBjb2x1bW5zLgorCisgICAgICAgIFRlc3Q6IGZhc3QvbGF5b3V0Zm9ybWF0dGlu Z2NvbnRleHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lkdGgtdHlwZS1zaW1wbGUzLmh0bWwKKworICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVMYXlvdXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpkaXN0cmlidXRlQXZhaWxhYmxlU3BhY2UpOgorCiAy MDIxLTA3LTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtURkNdIEtlZXAgdHJhY2sgb2YgYm90aCB0aGUgZml4ZWQgYW5kIHBlcmNlbnQgbWF4aW11bSB2 YWx1ZXMgZm9yIGVhY2ggY29sdW1uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVMYXlvdXQuY3BwCmluZGV4IDA5 Y2U0Nzc2NDdmNzQ3ODM0ZDE5NmVkMmQ5N2JlZWQxOTljOTNjYzMuLmVmOGJlYTYwM2Q2MmRiNWU1 ZmNjNGE1YTIyNzI1Y2FiZmU4Y2VlYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVMYXlvdXQuY3BwCkBA IC0yMjQsNjYgKzIyNCwxMDEgQEAgc3RhdGljIFZlY3RvcjxMYXlvdXRVbml0PiBkaXN0cmlidXRl QXZhaWxhYmxlU3BhY2UoY29uc3QgVGFibGVHcmlkJiBncmlkLCBMYXlvdXQKICAgICBmb3IgKHNp emVfdCBjb2x1bW5JbmRleCA9IDA7IGNvbHVtbkluZGV4IDwgcmVzb2x2ZWRJdGVtcy5zaXplKCk7 ICsrY29sdW1uSW5kZXgpCiAgICAgICAgIGRpc3RyaWJ1dGVkU3BhY2VzW2NvbHVtbkluZGV4XSA9 IExheW91dFVuaXQgeyByZXNvbHZlZEl0ZW1zW2NvbHVtbkluZGV4XS0+cHJlZmVycmVkU2l6ZSB9 OwogCisgICAgaWYgKCFzcGFjZVRvRGlzdHJpYnV0ZSkgeworICAgICAgICAvLyBQcmVmZXJyZWQg c2l6ZSBjb3ZlcnMgdGhlIHNwYWNlcy4gVGhlcmUncyBub3RoaW5nIGV4dHJhIHNwYWFjZSB0byBk aXN0cmlidXRlLgorICAgICAgICByZXR1cm4gZGlzdHJpYnV0ZWRTcGFjZXM7CisgICAgfQorCisg ICAgLy8gU2V0dXAgdGhlIHByaW9yaXR5IGxpc3RzLiBXZSB1c2UgdGhlc2Ugd2hlbiBleHBhbmRp bmcvc2hyaW5raW5nIHNsb3RzLgorICAgIFZlY3RvcjxzaXplX3Q+IGF1dG9Db2x1bW5JbmRleGVz OworICAgIFZlY3RvcjxzaXplX3Q+IHJlbGF0aXZlQ29sdW1uSW5kZXhlczsKKyAgICBWZWN0b3I8 c2l6ZV90PiBmaXhlZENvbHVtbkluZGV4ZXM7CisgICAgVmVjdG9yPHNpemVfdD4gcGVyY2VudENv bHVtbkluZGV4ZXM7CisKKyAgICBmb3IgKHNpemVfdCBjb2x1bW5JbmRleCA9IDA7IGNvbHVtbklu ZGV4IDwgcmVzb2x2ZWRJdGVtcy5zaXplKCk7ICsrY29sdW1uSW5kZXgpIHsKKyAgICAgICAgc3dp dGNoIChyZXNvbHZlZEl0ZW1zW2NvbHVtbkluZGV4XS0+dHlwZSkgeworICAgICAgICBjYXNlIEdy aWRTcGFjZTo6VHlwZTo6UGVyY2VudDoKKyAgICAgICAgICAgIHBlcmNlbnRDb2x1bW5JbmRleGVz LmFwcGVuZChjb2x1bW5JbmRleCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBH cmlkU3BhY2U6OlR5cGU6OkZpeGVkOgorICAgICAgICAgICAgZml4ZWRDb2x1bW5JbmRleGVzLmFw cGVuZChjb2x1bW5JbmRleCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBHcmlk U3BhY2U6OlR5cGU6OlJlbGF0aXZlOgorICAgICAgICAgICAgcmVsYXRpdmVDb2x1bW5JbmRleGVz LmFwcGVuZChjb2x1bW5JbmRleCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBH cmlkU3BhY2U6OlR5cGU6OkF1dG86CisgICAgICAgICAgICBhdXRvQ29sdW1uSW5kZXhlcy5hcHBl bmQoY29sdW1uSW5kZXgpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6Cisg ICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICB9CisgICAgfQorCiAgICAgaWYgKHNwYWNlVG9EaXN0cmlidXRlID4gMCkgewogICAgICAg ICAvLyBFYWNoIGNvbHVtbiBjYW4gZ2V0IHNvbWUgZXh0cmEgc3BhY2UuCi0gICAgICAgIGF1dG8g Y29sdW1uc0ZsZXhCYXNlID0gYWRqdXN0YWJsZWRTcGFjZS5mbGV4QmFzZSA/IHNwYWNlVG9EaXN0 cmlidXRlIC8gYWRqdXN0YWJsZWRTcGFjZS5mbGV4QmFzZSA6IDAuZjsKLSAgICAgICAgZm9yIChz aXplX3QgY29sdW1uSW5kZXggPSAwOyBjb2x1bW5JbmRleCA8IHJlc29sdmVkSXRlbXMuc2l6ZSgp OyArK2NvbHVtbkluZGV4KSB7Ci0gICAgICAgICAgICBhdXRvIGNvbHVtbkV4dHJhU3BhY2UgPSBj b2x1bW5zRmxleEJhc2UgKiByZXNvbHZlZEl0ZW1zW2NvbHVtbkluZGV4XS0+ZmxleEJhc2U7Ci0g ICAgICAgICAgICBkaXN0cmlidXRlZFNwYWNlc1tjb2x1bW5JbmRleF0gKz0gTGF5b3V0VW5pdCB7 IGNvbHVtbkV4dHJhU3BhY2UgfTsKLSAgICAgICAgfQotICAgIH0gZWxzZSBpZiAoc3BhY2VUb0Rp c3RyaWJ1dGUgPCAwKSB7Ci0gICAgICAgIC8vIENhbid0IGFjY29tb2RhdGUgdGhlIHByZWZlcnJl ZCB3aWR0aC4gTGV0J3MgdXNlIHRoZSBwcmlvcml0eSBsaXN0IHRvIHNocmluayBjb2x1bW5zLgot ICAgICAgICBWZWN0b3I8c2l6ZV90PiBhdXRvQ29sdW1uSW5kZXhlczsKLSAgICAgICAgVmVjdG9y PHNpemVfdD4gcmVsYXRpdmVDb2x1bW5JbmRleGVzOwotICAgICAgICBWZWN0b3I8c2l6ZV90PiBm aXhlZENvbHVtbkluZGV4ZXM7Ci0gICAgICAgIFZlY3RvcjxzaXplX3Q+IHBlcmNlbnRDb2x1bW5J bmRleGVzOwotCi0gICAgICAgIGZvciAoc2l6ZV90IGNvbHVtbkluZGV4ID0gMDsgY29sdW1uSW5k ZXggPCByZXNvbHZlZEl0ZW1zLnNpemUoKTsgKytjb2x1bW5JbmRleCkgewotICAgICAgICAgICAg c3dpdGNoIChyZXNvbHZlZEl0ZW1zW2NvbHVtbkluZGV4XS0+dHlwZSkgewotICAgICAgICAgICAg Y2FzZSBHcmlkU3BhY2U6OlR5cGU6OlBlcmNlbnQ6Ci0gICAgICAgICAgICAgICAgcGVyY2VudENv bHVtbkluZGV4ZXMuYXBwZW5kKGNvbHVtbkluZGV4KTsKLSAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgIGNhc2UgR3JpZFNwYWNlOjpUeXBlOjpGaXhlZDoKLSAgICAgICAgICAgICAg ICBmaXhlZENvbHVtbkluZGV4ZXMuYXBwZW5kKGNvbHVtbkluZGV4KTsKLSAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgR3JpZFNwYWNlOjpUeXBlOjpSZWxhdGl2ZToKLSAg ICAgICAgICAgICAgICByZWxhdGl2ZUNvbHVtbkluZGV4ZXMuYXBwZW5kKGNvbHVtbkluZGV4KTsK LSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgR3JpZFNwYWNlOjpUeXBl OjpBdXRvOgotICAgICAgICAgICAgICAgIGF1dG9Db2x1bW5JbmRleGVzLmFwcGVuZChjb2x1bW5J bmRleCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBkZWZhdWx0OgotICAg ICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgICAgIGJyZWFr OwotICAgICAgICAgICAgfQotICAgICAgICB9CisgICAgICAgIGF1dG8gaGFzU3BhY2VUb0Rpc3Ry aWJ1dGUgPSBbJl0geworICAgICAgICAgICAgQVNTRVJUKHNwYWNlVG9EaXN0cmlidXRlID4gLUxh eW91dFVuaXQ6OmVwc2lsb24oKSk7CisgICAgICAgICAgICByZXR1cm4gc3BhY2VUb0Rpc3RyaWJ1 dGUgPiBMYXlvdXRVbml0OjplcHNpbG9uKCk7CisgICAgICAgIH07CiAKLSAgICAgICAgYXV0byBz cGFjZU5lZWRlZCA9IC1zcGFjZVRvRGlzdHJpYnV0ZTsKLSAgICAgICAgYXV0byBzaHJpbmtTcGFj ZUZvclR5cGUgPSBbJl0oY29uc3QgYXV0byYgY29sdW1uSW5kZXhlcykgeworICAgICAgICBhdXRv IGV4cGFuZFNwYWNlID0gWyZdKGNvbnN0IGF1dG8mIGNvbHVtbkluZGV4ZXMpIHsKICAgICAgICAg ICAgIGF1dG8gYWRqdXN0YWJsZWRTcGFjZSA9IEdyaWRTcGFjZSB7IH07CiAgICAgICAgICAgICBm b3IgKGF1dG8mIGNvbHVtbkluZGV4IDogY29sdW1uSW5kZXhlcykKICAgICAgICAgICAgICAgICBh ZGp1c3RhYmxlZFNwYWNlICs9ICpyZXNvbHZlZEl0ZW1zW2NvbHVtbkluZGV4XTsKIAotICAgICAg ICAgICAgYXV0byBjb2x1bW5zRmxleEJhc2UgPSBhZGp1c3RhYmxlZFNwYWNlLmZsZXhCYXNlID8g c3BhY2VOZWVkZWQgLyBhZGp1c3RhYmxlZFNwYWNlLmZsZXhCYXNlIDogMC5mOworICAgICAgICAg ICAgYXV0byBjb2x1bW5zRmxleEJhc2UgPSBhZGp1c3RhYmxlZFNwYWNlLmZsZXhCYXNlID8gc3Bh Y2VUb0Rpc3RyaWJ1dGUgLyBhZGp1c3RhYmxlZFNwYWNlLmZsZXhCYXNlIDogMC5mOwogICAgICAg ICAgICAgZm9yIChhdXRvJiBjb2x1bW5JbmRleCA6IGNvbHVtbkluZGV4ZXMpIHsKLSAgICAgICAg ICAgICAgICBhdXRvJiByZXNvbHZlZEl0ZW0gPSAqcmVzb2x2ZWRJdGVtc1tjb2x1bW5JbmRleF07 Ci0gICAgICAgICAgICAgICAgYXV0byBzcGFjZVRvUmVtb3ZlID0gc3RkOjptaW4ocmVzb2x2ZWRJ dGVtLnByZWZlcnJlZFNpemUgLSByZXNvbHZlZEl0ZW0ubWluaW11bVNpemUsIGNvbHVtbnNGbGV4 QmFzZSAqIHJlc29sdmVkSXRlbS5mbGV4QmFzZSk7Ci0gICAgICAgICAgICAgICAgc3BhY2VUb1Jl bW92ZSA9IHN0ZDo6bWluKHNwYWNlVG9SZW1vdmUsIHNwYWNlTmVlZGVkKTsKLSAgICAgICAgICAg ICAgICBkaXN0cmlidXRlZFNwYWNlc1tjb2x1bW5JbmRleF0gLT0gc3BhY2VUb1JlbW92ZTsKLSAg ICAgICAgICAgICAgICBzcGFjZU5lZWRlZCAtPSBzcGFjZVRvUmVtb3ZlOwotICAgICAgICAgICAg ICAgIGlmICghc3BhY2VOZWVkZWQpCisgICAgICAgICAgICAgICAgYXV0byBleHRyYVNwYWNlID0g Y29sdW1uc0ZsZXhCYXNlICogcmVzb2x2ZWRJdGVtc1tjb2x1bW5JbmRleF0tPmZsZXhCYXNlOwor ICAgICAgICAgICAgICAgIGRpc3RyaWJ1dGVkU3BhY2VzW2NvbHVtbkluZGV4XSArPSBMYXlvdXRV bml0IHsgZXh0cmFTcGFjZSB9OworICAgICAgICAgICAgICAgIHNwYWNlVG9EaXN0cmlidXRlIC09 IGV4dHJhU3BhY2U7CisgICAgICAgICAgICAgICAgaWYgKCFoYXNTcGFjZVRvRGlzdHJpYnV0ZSgp KQogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICBBU1NFUlQoc3BhY2VOZWVkZWQgPiAwKTsKICAgICAgICAgfTsKLSAgICAgICAgc2hyaW5rU3Bh Y2VGb3JUeXBlKGF1dG9Db2x1bW5JbmRleGVzKTsKLSAgICAgICAgaWYgKHNwYWNlTmVlZGVkKQot ICAgICAgICAgICAgc2hyaW5rU3BhY2VGb3JUeXBlKHJlbGF0aXZlQ29sdW1uSW5kZXhlcyk7Ci0g ICAgICAgIGlmIChzcGFjZU5lZWRlZCkKLSAgICAgICAgICAgIHNocmlua1NwYWNlRm9yVHlwZShm aXhlZENvbHVtbkluZGV4ZXMpOwotICAgICAgICBpZiAoc3BhY2VOZWVkZWQpCi0gICAgICAgICAg ICBzaHJpbmtTcGFjZUZvclR5cGUocGVyY2VudENvbHVtbkluZGV4ZXMpOworICAgICAgICAvLyBX ZSBkaXN0cmlidXRlIHRoZSBleHRyYSBzcGFjZSBhbW9uZyBjb2x1bW5zIGluIHRoZSBwcmlvcml0 eSBvcmRlciBhcyBmb2xsb3dzOgorICAgICAgICBleHBhbmRTcGFjZShmaXhlZENvbHVtbkluZGV4 ZXMpOworICAgICAgICBpZiAoaGFzU3BhY2VUb0Rpc3RyaWJ1dGUoKSkKKyAgICAgICAgICAgIGV4 cGFuZFNwYWNlKHBlcmNlbnRDb2x1bW5JbmRleGVzKTsKKyAgICAgICAgaWYgKGhhc1NwYWNlVG9E aXN0cmlidXRlKCkpCisgICAgICAgICAgICBleHBhbmRTcGFjZShyZWxhdGl2ZUNvbHVtbkluZGV4 ZXMpOworICAgICAgICBpZiAoaGFzU3BhY2VUb0Rpc3RyaWJ1dGUoKSkKKyAgICAgICAgICAgIGV4 cGFuZFNwYWNlKGF1dG9Db2x1bW5JbmRleGVzKTsKKyAgICAgICAgQVNTRVJUKCFoYXNTcGFjZVRv RGlzdHJpYnV0ZSgpKTsKKyAgICAgICAgcmV0dXJuIGRpc3RyaWJ1dGVkU3BhY2VzOwogICAgIH0K KyAgICAvLyBDYW4ndCBhY2NvbW9kYXRlIHRoZSBwcmVmZXJyZWQgd2lkdGguIExldCdzIHVzZSB0 aGUgcHJpb3JpdHkgbGlzdCB0byBzaHJpbmsgY29sdW1ucy4KKyAgICBhdXRvIHNwYWNlTmVlZGVk ID0gLXNwYWNlVG9EaXN0cmlidXRlOworCisgICAgYXV0byBuZWVkc01vcmVTcGFjZSA9IFsmXSB7 CisgICAgICAgIEFTU0VSVChzcGFjZU5lZWRlZCA+IC1MYXlvdXRVbml0OjplcHNpbG9uKCkpOwor ICAgICAgICByZXR1cm4gc3BhY2VOZWVkZWQgPiBMYXlvdXRVbml0OjplcHNpbG9uKCk7CisgICAg fTsKKworICAgIGF1dG8gc2hyaW5rU3BhY2UgPSBbJl0oY29uc3QgYXV0byYgY29sdW1uSW5kZXhl cykgeworICAgICAgICBhdXRvIGFkanVzdGFibGVkU3BhY2UgPSBHcmlkU3BhY2UgeyB9OworICAg ICAgICBmb3IgKGF1dG8mIGNvbHVtbkluZGV4IDogY29sdW1uSW5kZXhlcykKKyAgICAgICAgICAg IGFkanVzdGFibGVkU3BhY2UgKz0gKnJlc29sdmVkSXRlbXNbY29sdW1uSW5kZXhdOworCisgICAg ICAgIGF1dG8gY29sdW1uc0ZsZXhCYXNlID0gYWRqdXN0YWJsZWRTcGFjZS5mbGV4QmFzZSA/IHNw YWNlTmVlZGVkIC8gYWRqdXN0YWJsZWRTcGFjZS5mbGV4QmFzZSA6IDAuZjsKKyAgICAgICAgZm9y IChhdXRvJiBjb2x1bW5JbmRleCA6IGNvbHVtbkluZGV4ZXMpIHsKKyAgICAgICAgICAgIGF1dG8m IHJlc29sdmVkSXRlbSA9ICpyZXNvbHZlZEl0ZW1zW2NvbHVtbkluZGV4XTsKKyAgICAgICAgICAg IGF1dG8gc3BhY2VUb1JlbW92ZSA9IHN0ZDo6bWluKHJlc29sdmVkSXRlbS5wcmVmZXJyZWRTaXpl IC0gcmVzb2x2ZWRJdGVtLm1pbmltdW1TaXplLCBjb2x1bW5zRmxleEJhc2UgKiByZXNvbHZlZEl0 ZW0uZmxleEJhc2UpOworICAgICAgICAgICAgc3BhY2VUb1JlbW92ZSA9IHN0ZDo6bWluKHNwYWNl VG9SZW1vdmUsIHNwYWNlTmVlZGVkKTsKKyAgICAgICAgICAgIGRpc3RyaWJ1dGVkU3BhY2VzW2Nv bHVtbkluZGV4XSAtPSBzcGFjZVRvUmVtb3ZlOworICAgICAgICAgICAgc3BhY2VOZWVkZWQgLT0g c3BhY2VUb1JlbW92ZTsKKyAgICAgICAgICAgIGlmICghbmVlZHNNb3JlU3BhY2UoKSkKKyAgICAg ICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICB9OworICAgIHNocmlua1NwYWNlKGF1 dG9Db2x1bW5JbmRleGVzKTsKKyAgICBpZiAobmVlZHNNb3JlU3BhY2UoKSkKKyAgICAgICAgc2hy aW5rU3BhY2UocmVsYXRpdmVDb2x1bW5JbmRleGVzKTsKKyAgICBpZiAobmVlZHNNb3JlU3BhY2Uo KSkKKyAgICAgICAgc2hyaW5rU3BhY2UoZml4ZWRDb2x1bW5JbmRleGVzKTsKKyAgICBpZiAobmVl ZHNNb3JlU3BhY2UoKSkKKyAgICAgICAgc2hyaW5rU3BhY2UocGVyY2VudENvbHVtbkluZGV4ZXMp OworICAgIEFTU0VSVCghbmVlZHNNb3JlU3BhY2UoKSk7CiAgICAgcmV0dXJuIGRpc3RyaWJ1dGVk U3BhY2VzOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggZGZjZjM1ODliM2RiOWNiOTMwZTU0YTAxMWY0NjUxNDIwNGYy NjE3YS4uNzk3ZjVlMTg5ZmYzOTc5NzA1MzdiY2IyMDZjYWI3YjRjY2RkNmUzNyAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDIxLTA3LTAyICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K KworICAgICAgICBbTEZDXVtURkNdIEFkZCBzdXBwb3J0IGZvciBwcmlvcml0eSBsaXN0IG9mIHdp ZHRoIHR5cGVzIHdoZW4gZXhwYW5kaW5nIGNvbHVtbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzYyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90 YWJsZS1zcGFjZS1taXhlZC13aWR0aC10eXBlLXNpbXBsZTMtZXhwZWN0ZWQuaHRtbDogQWRkZWQu CisgICAgICAgICogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zcGFjZS1taXhl ZC13aWR0aC10eXBlLXNpbXBsZTMuaHRtbDogQWRkZWQuCisKIDIwMjEtMDctMDEgIEplYW4tWXZl cyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIExhc3QgZmV3IHNl Y29uZHMgb2YgJ2F1ZGlvL3dlYm07IGNvZGVjcz12b3JiaXMnIGFwcGVuZGVkIHRvIGEgU2FtcGxl QnVmZmVyIGFyZSBub3QgcGxheWVkCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xheW91 dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXNwYWNlLW1peGVkLXdpZHRoLXR5cGUtc2ltcGxlMy1l eHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90 YWJsZS1zcGFjZS1taXhlZC13aWR0aC10eXBlLXNpbXBsZTMtZXhwZWN0ZWQuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5kNzhkMjNmZTYzMGU3YjRjYjRiOGFjNTJkMWJhOTBkMzg2ZTZjNjRiCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1z cGFjZS1taXhlZC13aWR0aC10eXBlLXNpbXBsZTMtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDI1 IEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBMYXlvdXRGb3Jt YXR0aW5nQ29udGV4dEVuYWJsZWQ9dHJ1ZSBMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0 aW9uRW5hYmxlZD1mYWxzZSBdIC0tPgorPHN0eWxlPgorYm9keSB7CisgIGZvbnQtc2l6ZTogMTZw eDsKKyAgb3ZlcmZsb3c6IGhpZGRlbjsKK30KKworZGl2IHsKKyAgaGVpZ2h0OiAyMHB4OworICBi YWNrZ3JvdW5kLWNvbG9yOiBibHVlOworfQorCisuaW5uZXIgeworICBiYWNrZ3JvdW5kLWNvbG9y OiBncmVlbjsKK30KKzwvc3R5bGU+CisKKzxkaXYgc3R5bGU9IndpZHRoOiAxMDBweCI+PGRpdiBj bGFzcz1pbm5lciBzdHlsZT0id2lkdGg6IDUwcHgiPjwvZGl2PjwvZGl2PgorPGRpdiBzdHlsZT0i d2lkdGg6IDUwMHB4Ij48ZGl2IGNsYXNzPWlubmVyIHN0eWxlPSJ3aWR0aDogNTAwcHgiPjwvZGl2 PjwvZGl2PgorPGRpdiBzdHlsZT0id2lkdGg6IDUwMHB4Ij48ZGl2IGNsYXNzPWlubmVyIHN0eWxl PSJ3aWR0aDogNTZweCI+PC9kaXY+PC9kaXY+Cis8ZGl2IHN0eWxlPSJ3aWR0aDogNTAwcHgiPjxk aXYgY2xhc3M9aW5uZXIgc3R5bGU9IndpZHRoOiA1MDBweCI+PC9kaXY+PC9kaXY+Cis8ZGl2IHN0 eWxlPSJ3aWR0aDogNTAwcHgiPjxkaXYgY2xhc3M9aW5uZXIgc3R5bGU9IndpZHRoOiA1cHgiPjwv ZGl2PjwvZGl2PgorPGRpdiBzdHlsZT0id2lkdGg6IDUwMHB4Ij48ZGl2IGNsYXNzPWlubmVyIHN0 eWxlPSJ3aWR0aDogMjUwcHgiPjwvZGl2PjwvZGl2PgorPGRpdiBzdHlsZT0id2lkdGg6IDQyOXB4 OyBoZWlnaHQ6IDMwcHg7Ij48ZGl2IGNsYXNzPWlubmVyIHN0eWxlPSJ3aWR0aDogMzAwcHg7IGhl aWdodDogMzBweDsiPjwvZGl2PjwvZGl2PgorPGRpdiBzdHlsZT0id2lkdGg6IDUwMHB4OyBoZWln aHQ6IDMwcHg7Ij48ZGl2IGNsYXNzPWlubmVyIHN0eWxlPSJ3aWR0aDogNTAwcHg7IGhlaWdodDog MzBweDsiPjwvZGl2PjwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRm b3JtYXR0aW5nY29udGV4dC90YWJsZS1zcGFjZS1taXhlZC13aWR0aC10eXBlLXNpbXBsZTMuaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc3BhY2Ut bWl4ZWQtd2lkdGgtdHlwZS1zaW1wbGUzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTJmMmEyMWE2N2E0MDU1 ZjBjMjZhMjYyMjQ5MjUxODY1OTU2MWE1YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lkdGgtdHlw ZS1zaW1wbGUzLmh0bWwKQEAgLTAsMCArMSw1NiBAQAorPCFET0NUWVBFIGh0bWw+PCEtLSB3ZWJr aXQtdGVzdC1ydW5uZXIgWyBMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEVuYWJsZWQ9dHJ1ZSBMYXlv dXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZD1mYWxzZSBdIC0tPgorPHN0eWxl PgordGQgeworICBoZWlnaHQ6IDEwcHg7CisgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgIHBh ZGRpbmc6IDBweDsKK30KKwordGFibGUgeworICBib3JkZXItc3BhY2luZzogMHB4OworfQorCiti b2R5IHsKKyAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7Cit9CisKK3RkOm50aC1jaGlsZChvZGQp IHsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9Cis8L3N0eWxlPgorPGRpdiBzdHlsZT0i d2lkdGg6IDUwMHB4OyI+Cis8dGFibGU+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogMTBweDsiPjwv dGQ+PHRkIHN0eWxlPSJ3aWR0aDogMTAlOyI+PC90ZD48L3RyPgorPHRyPjx0ZCBzdHlsZT0id2lk dGg6IDEwJTsiPjwvdGQ+PHRkIHN0eWxlPSJ3aWR0aDogMTBweDsiPjwvdGQ+PC90cj4KKzwvdGFi bGU+Cis8dGFibGU+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogMTAwcHg7Ij48L3RkPjx0ZCBzdHls ZT0id2lkdGg6IDEwMCU7Ij48L3RkPjwvdHI+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogMTAwJTsi PjwvdGQ+PHRkIHN0eWxlPSJ3aWR0aDogMTAwcHg7Ij48L3RkPjwvdHI+Cis8L3RhYmxlPgorPHRh YmxlPgorPHRyPjx0ZCBzdHlsZT0id2lkdGg6IDgwcHg7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6 IDIwMHB4OyI+PC90ZD48L3RyPgorPHRyPjx0ZCBzdHlsZT0id2lkdGg6IDEwJTsiPjwvdGQ+PHRk IHN0eWxlPSJ3aWR0aDogODAlOyI+PC90ZD48L3RyPgorPC90YWJsZT4KKzx0YWJsZT4KKzx0cj48 dGQgc3R5bGU9IndpZHRoOiA4MHB4OyI+PC90ZD48dGQgc3R5bGU9IndpZHRoOiAxMCU7Ij48L3Rk PjwvdHI+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogMTAwJTsiPjwvdGQ+PHRkIHN0eWxlPSJ3aWR0 aDogMjAwcHg7Ij48L3RkPjwvdHI+Cis8L3RhYmxlPgorPHRhYmxlPgorPHRyPjx0ZCBzdHlsZT0i d2lkdGg6IDEwMDBweDsiPjwvdGQ+PHRkIHN0eWxlPSJ3aWR0aDogMTAwMCU7Ij48L3RkPjwvdHI+ Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogMSU7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDFweDsi PjwvdGQ+PC90cj4KKzwvdGFibGU+Cis8dGFibGU+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogMjUw cHg7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDUwJTsiPjwvdGQ+PC90cj4KKzx0cj48dGQgc3R5 bGU9IndpZHRoOiA1MDBweDsiPjwvdGQ+PHRkIHN0eWxlPSJ3aWR0aDogMCU7Ij48L3RkPjwvdHI+ Cis8L3RhYmxlPgorPHRhYmxlPgorPHRyPjx0ZCBzdHlsZT0id2lkdGg6IDEwMHB4OyI+PC90ZD48 dGQgc3R5bGU9IndpZHRoOiAxMCU7Ij48L3RkPjwvdHI+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDog MjAwcHg7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDIwJTsiPjwvdGQ+PC90cj4KKzx0cj48dGQg c3R5bGU9IndpZHRoOiAzMDBweDsiPjwvdGQ+PHRkIHN0eWxlPSJ3aWR0aDogMzAlOyI+PC90ZD48 L3RyPgorPC90YWJsZT4KKzx0YWJsZT4KKzx0cj48dGQgc3R5bGU9IndpZHRoOiAxMDBweDsiPjwv dGQ+PHRkIHN0eWxlPSJ3aWR0aDogMTAlOyI+PC90ZD48L3RyPgorPHRyPjx0ZCBzdHlsZT0id2lk dGg6IDIwMCU7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDIwMHB4OyI+PC90ZD48L3RyPgorPHRy Pjx0ZCBzdHlsZT0id2lkdGg6IDMwMHB4OyI+PC90ZD48dGQgc3R5bGU9IndpZHRoOiAzMCU7Ij48 L3RkPjwvdHI+Cis8L3RhYmxlPgorPC9kaXY+Cg== 432840 2021-07-02 21:20:48 -0700 2021-07-03 06:21:52 -0700 Patch bug-227627-20210702212047.patch text/plain 12815 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQxNjRiMWUzODczNmYw MTg3NWRjZmQ3YTRjMmVhMjFlZjg1ZDczMy4uOGY5MmQ2ZjhhZThlNThhMDNhNWJkYTI2YTk4YWRl ZDNhZjJmOTIzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA3LTAyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIEFkZCBzdXBw b3J0IGZvciBwcmlvcml0eSBsaXN0IG9mIHdpZHRoIHR5cGVzIHdoZW4gZXhwYW5kaW5nIGNvbHVt bnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzYy NworCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFdoZW4g ZXhwYW5kaW5nIHRoZSBjb2x1bW5zIHRvIHVzZSB0aGUgZXh0cmEgc3BhY2UgYXZhaWxhYmxlLCB3 ZSBuZWVkIHRvIHByaW9yaXRpemUgY2VydGFpbiBjb2x1bW5zCisgICAgICAgIHdpdGggc3BlY2lm aWMgd2lkdGggdHlwZXM6IGZpeGVkID4gcGVyY2VudCA+IHJlbGF0aXZlID4gYXV0bworICAgICAg ICBUaGlzIGlzIF9hbG1vc3RfIHRoZSByZXZlcnNlZCB2ZXJzaW9uIG9mIHRoZSBzaHJpbmtpbmcg cHJpb3JpdHkgbGlzdCAoYnV0IG5vdCBxdWl0ZSkuCisgICAgICAgIE5vdyB3ZSBjYW4gaGF2ZSBt aXhlZCBjb2x1bW4gdHlwZXMgYWNyb3NzIG11bHRpcGxlIHJvd3Mgd2l0aCBleHBhbmRpbmcgYW5k IHNocmlua2luZyBjb2x1bW5zLgorCisgICAgICAgIFRlc3Q6IGZhc3QvbGF5b3V0Zm9ybWF0dGlu Z2NvbnRleHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lkdGgtdHlwZS1zaW1wbGUzLmh0bWwKKworICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVMYXlvdXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpkaXN0cmlidXRlQXZhaWxhYmxlU3BhY2UpOgorCiAy MDIxLTA3LTAxICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CiAKICAgICAgICAg W0NvY29hXSBMYXN0IGZldyBzZWNvbmRzIG9mICdhdWRpby93ZWJtOyBjb2RlY3M9dm9yYmlzJyBh cHBlbmRlZCB0byBhIFNhbXBsZUJ1ZmZlciBhcmUgbm90IHBsYXllZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUxheW91dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxl TGF5b3V0LmNwcAppbmRleCBiNDk4YWQ0ZTJmZWE2MTkyYzA2YWEyYTA1OWFkNDg5ZmZhMzFhZjYw Li5mNWU4NWVlNDBmNTFkZmFmNWU2ODJlY2NhNGQxOGU0ODJlNWYzNzMyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlTGF5b3V0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxl L1RhYmxlTGF5b3V0LmNwcApAQCAtMjI0LDY2ICsyMjQsMTAxIEBAIHN0YXRpYyBWZWN0b3I8TGF5 b3V0VW5pdD4gZGlzdHJpYnV0ZUF2YWlsYWJsZVNwYWNlKGNvbnN0IFRhYmxlR3JpZCYgZ3JpZCwg TGF5b3V0CiAgICAgZm9yIChzaXplX3QgY29sdW1uSW5kZXggPSAwOyBjb2x1bW5JbmRleCA8IHJl c29sdmVkSXRlbXMuc2l6ZSgpOyArK2NvbHVtbkluZGV4KQogICAgICAgICBkaXN0cmlidXRlZFNw YWNlc1tjb2x1bW5JbmRleF0gPSBMYXlvdXRVbml0IHsgcmVzb2x2ZWRJdGVtc1tjb2x1bW5JbmRl eF0tPnByZWZlcnJlZFNpemUgfTsKIAorICAgIGlmICghc3BhY2VUb0Rpc3RyaWJ1dGUpIHsKKyAg ICAgICAgLy8gUHJlZmVycmVkIHNpemUgY292ZXJzIHRoZSBzcGFjZXMuIFRoZXJlJ3Mgbm90aGlu ZyBleHRyYSBzcGFhY2UgdG8gZGlzdHJpYnV0ZS4KKyAgICAgICAgcmV0dXJuIGRpc3RyaWJ1dGVk U3BhY2VzOworICAgIH0KKworICAgIC8vIFNldHVwIHRoZSBwcmlvcml0eSBsaXN0cy4gV2UgdXNl IHRoZXNlIHdoZW4gZXhwYW5kaW5nL3Nocmlua2luZyBzbG90cy4KKyAgICBWZWN0b3I8c2l6ZV90 PiBhdXRvQ29sdW1uSW5kZXhlczsKKyAgICBWZWN0b3I8c2l6ZV90PiByZWxhdGl2ZUNvbHVtbklu ZGV4ZXM7CisgICAgVmVjdG9yPHNpemVfdD4gZml4ZWRDb2x1bW5JbmRleGVzOworICAgIFZlY3Rv cjxzaXplX3Q+IHBlcmNlbnRDb2x1bW5JbmRleGVzOworCisgICAgZm9yIChzaXplX3QgY29sdW1u SW5kZXggPSAwOyBjb2x1bW5JbmRleCA8IHJlc29sdmVkSXRlbXMuc2l6ZSgpOyArK2NvbHVtbklu ZGV4KSB7CisgICAgICAgIHN3aXRjaCAocmVzb2x2ZWRJdGVtc1tjb2x1bW5JbmRleF0tPnR5cGUp IHsKKyAgICAgICAgY2FzZSBHcmlkU3BhY2U6OlR5cGU6OlBlcmNlbnQ6CisgICAgICAgICAgICBw ZXJjZW50Q29sdW1uSW5kZXhlcy5hcHBlbmQoY29sdW1uSW5kZXgpOworICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIGNhc2UgR3JpZFNwYWNlOjpUeXBlOjpGaXhlZDoKKyAgICAgICAgICAgIGZp eGVkQ29sdW1uSW5kZXhlcy5hcHBlbmQoY29sdW1uSW5kZXgpOworICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIGNhc2UgR3JpZFNwYWNlOjpUeXBlOjpSZWxhdGl2ZToKKyAgICAgICAgICAgIHJl bGF0aXZlQ29sdW1uSW5kZXhlcy5hcHBlbmQoY29sdW1uSW5kZXgpOworICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIGNhc2UgR3JpZFNwYWNlOjpUeXBlOjpBdXRvOgorICAgICAgICAgICAgYXV0 b0NvbHVtbkluZGV4ZXMuYXBwZW5kKGNvbHVtbkluZGV4KTsKKyAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KKwogICAgIGlmIChzcGFjZVRvRGlzdHJp YnV0ZSA+IDApIHsKICAgICAgICAgLy8gRWFjaCBjb2x1bW4gY2FuIGdldCBzb21lIGV4dHJhIHNw YWNlLgotICAgICAgICBhdXRvIGNvbHVtbnNGbGV4QmFzZSA9IGFkanVzdGFibGVkU3BhY2UuZmxl eEJhc2UgPyBzcGFjZVRvRGlzdHJpYnV0ZSAvIGFkanVzdGFibGVkU3BhY2UuZmxleEJhc2UgOiAw LmY7Ci0gICAgICAgIGZvciAoc2l6ZV90IGNvbHVtbkluZGV4ID0gMDsgY29sdW1uSW5kZXggPCBy ZXNvbHZlZEl0ZW1zLnNpemUoKTsgKytjb2x1bW5JbmRleCkgewotICAgICAgICAgICAgYXV0byBj b2x1bW5FeHRyYVNwYWNlID0gY29sdW1uc0ZsZXhCYXNlICogcmVzb2x2ZWRJdGVtc1tjb2x1bW5J bmRleF0tPmZsZXhCYXNlOwotICAgICAgICAgICAgZGlzdHJpYnV0ZWRTcGFjZXNbY29sdW1uSW5k ZXhdICs9IExheW91dFVuaXQgeyBjb2x1bW5FeHRyYVNwYWNlIH07Ci0gICAgICAgIH0KLSAgICB9 IGVsc2UgaWYgKHNwYWNlVG9EaXN0cmlidXRlIDwgMCkgewotICAgICAgICAvLyBDYW4ndCBhY2Nv bW9kYXRlIHRoZSBwcmVmZXJyZWQgd2lkdGguIExldCdzIHVzZSB0aGUgcHJpb3JpdHkgbGlzdCB0 byBzaHJpbmsgY29sdW1ucy4KLSAgICAgICAgVmVjdG9yPHNpemVfdD4gYXV0b0NvbHVtbkluZGV4 ZXM7Ci0gICAgICAgIFZlY3RvcjxzaXplX3Q+IHJlbGF0aXZlQ29sdW1uSW5kZXhlczsKLSAgICAg ICAgVmVjdG9yPHNpemVfdD4gZml4ZWRDb2x1bW5JbmRleGVzOwotICAgICAgICBWZWN0b3I8c2l6 ZV90PiBwZXJjZW50Q29sdW1uSW5kZXhlczsKLQotICAgICAgICBmb3IgKHNpemVfdCBjb2x1bW5J bmRleCA9IDA7IGNvbHVtbkluZGV4IDwgcmVzb2x2ZWRJdGVtcy5zaXplKCk7ICsrY29sdW1uSW5k ZXgpIHsKLSAgICAgICAgICAgIHN3aXRjaCAocmVzb2x2ZWRJdGVtc1tjb2x1bW5JbmRleF0tPnR5 cGUpIHsKLSAgICAgICAgICAgIGNhc2UgR3JpZFNwYWNlOjpUeXBlOjpQZXJjZW50OgotICAgICAg ICAgICAgICAgIHBlcmNlbnRDb2x1bW5JbmRleGVzLmFwcGVuZChjb2x1bW5JbmRleCk7Ci0gICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIEdyaWRTcGFjZTo6VHlwZTo6Rml4 ZWQ6Ci0gICAgICAgICAgICAgICAgZml4ZWRDb2x1bW5JbmRleGVzLmFwcGVuZChjb2x1bW5JbmRl eCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIEdyaWRTcGFjZTo6 VHlwZTo6UmVsYXRpdmU6Ci0gICAgICAgICAgICAgICAgcmVsYXRpdmVDb2x1bW5JbmRleGVzLmFw cGVuZChjb2x1bW5JbmRleCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBj YXNlIEdyaWRTcGFjZTo6VHlwZTo6QXV0bzoKLSAgICAgICAgICAgICAgICBhdXRvQ29sdW1uSW5k ZXhlcy5hcHBlbmQoY29sdW1uSW5kZXgpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAg ICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQorICAgICAgICBh dXRvIGhhc1NwYWNlVG9EaXN0cmlidXRlID0gWyZdIHsKKyAgICAgICAgICAgIEFTU0VSVChzcGFj ZVRvRGlzdHJpYnV0ZSA+IC1MYXlvdXRVbml0OjplcHNpbG9uKCkpOworICAgICAgICAgICAgcmV0 dXJuIHNwYWNlVG9EaXN0cmlidXRlID4gTGF5b3V0VW5pdDo6ZXBzaWxvbigpOworICAgICAgICB9 OwogCi0gICAgICAgIGF1dG8gc3BhY2VOZWVkZWQgPSAtc3BhY2VUb0Rpc3RyaWJ1dGU7Ci0gICAg ICAgIGF1dG8gc2hyaW5rU3BhY2VGb3JUeXBlID0gWyZdKGNvbnN0IGF1dG8mIGNvbHVtbkluZGV4 ZXMpIHsKKyAgICAgICAgYXV0byBleHBhbmRTcGFjZSA9IFsmXShjb25zdCBhdXRvJiBjb2x1bW5J bmRleGVzKSB7CiAgICAgICAgICAgICBhdXRvIGFkanVzdGFibGVkU3BhY2UgPSBHcmlkU3BhY2Ug eyB9OwogICAgICAgICAgICAgZm9yIChhdXRvJiBjb2x1bW5JbmRleCA6IGNvbHVtbkluZGV4ZXMp CiAgICAgICAgICAgICAgICAgYWRqdXN0YWJsZWRTcGFjZSArPSAqcmVzb2x2ZWRJdGVtc1tjb2x1 bW5JbmRleF07CiAKLSAgICAgICAgICAgIGF1dG8gY29sdW1uc0ZsZXhCYXNlID0gYWRqdXN0YWJs ZWRTcGFjZS5mbGV4QmFzZSA/IHNwYWNlTmVlZGVkIC8gYWRqdXN0YWJsZWRTcGFjZS5mbGV4QmFz ZSA6IDAuZjsKKyAgICAgICAgICAgIGF1dG8gY29sdW1uc0ZsZXhCYXNlID0gYWRqdXN0YWJsZWRT cGFjZS5mbGV4QmFzZSA/IHNwYWNlVG9EaXN0cmlidXRlIC8gYWRqdXN0YWJsZWRTcGFjZS5mbGV4 QmFzZSA6IDAuZjsKICAgICAgICAgICAgIGZvciAoYXV0byYgY29sdW1uSW5kZXggOiBjb2x1bW5J bmRleGVzKSB7Ci0gICAgICAgICAgICAgICAgYXV0byYgcmVzb2x2ZWRJdGVtID0gKnJlc29sdmVk SXRlbXNbY29sdW1uSW5kZXhdOwotICAgICAgICAgICAgICAgIGF1dG8gc3BhY2VUb1JlbW92ZSA9 IHN0ZDo6bWluKHJlc29sdmVkSXRlbS5wcmVmZXJyZWRTaXplIC0gcmVzb2x2ZWRJdGVtLm1pbmlt dW1TaXplLCBjb2x1bW5zRmxleEJhc2UgKiByZXNvbHZlZEl0ZW0uZmxleEJhc2UpOwotICAgICAg ICAgICAgICAgIHNwYWNlVG9SZW1vdmUgPSBzdGQ6Om1pbihzcGFjZVRvUmVtb3ZlLCBzcGFjZU5l ZWRlZCk7Ci0gICAgICAgICAgICAgICAgZGlzdHJpYnV0ZWRTcGFjZXNbY29sdW1uSW5kZXhdIC09 IHNwYWNlVG9SZW1vdmU7Ci0gICAgICAgICAgICAgICAgc3BhY2VOZWVkZWQgLT0gc3BhY2VUb1Jl bW92ZTsKLSAgICAgICAgICAgICAgICBpZiAoIXNwYWNlTmVlZGVkKQorICAgICAgICAgICAgICAg IGF1dG8gZXh0cmFTcGFjZSA9IGNvbHVtbnNGbGV4QmFzZSAqIHJlc29sdmVkSXRlbXNbY29sdW1u SW5kZXhdLT5mbGV4QmFzZTsKKyAgICAgICAgICAgICAgICBkaXN0cmlidXRlZFNwYWNlc1tjb2x1 bW5JbmRleF0gKz0gTGF5b3V0VW5pdCB7IGV4dHJhU3BhY2UgfTsKKyAgICAgICAgICAgICAgICBz cGFjZVRvRGlzdHJpYnV0ZSAtPSBleHRyYVNwYWNlOworICAgICAgICAgICAgICAgIGlmICghaGFz U3BhY2VUb0Rpc3RyaWJ1dGUoKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICAgICAgfQotICAgICAgICAgICAgQVNTRVJUKHNwYWNlTmVlZGVkID4gMCk7CiAgICAgICAgIH07 Ci0gICAgICAgIHNocmlua1NwYWNlRm9yVHlwZShhdXRvQ29sdW1uSW5kZXhlcyk7Ci0gICAgICAg IGlmIChzcGFjZU5lZWRlZCkKLSAgICAgICAgICAgIHNocmlua1NwYWNlRm9yVHlwZShyZWxhdGl2 ZUNvbHVtbkluZGV4ZXMpOwotICAgICAgICBpZiAoc3BhY2VOZWVkZWQpCi0gICAgICAgICAgICBz aHJpbmtTcGFjZUZvclR5cGUoZml4ZWRDb2x1bW5JbmRleGVzKTsKLSAgICAgICAgaWYgKHNwYWNl TmVlZGVkKQotICAgICAgICAgICAgc2hyaW5rU3BhY2VGb3JUeXBlKHBlcmNlbnRDb2x1bW5JbmRl eGVzKTsKKyAgICAgICAgLy8gV2UgZGlzdHJpYnV0ZSB0aGUgZXh0cmEgc3BhY2UgYW1vbmcgY29s dW1ucyBpbiB0aGUgcHJpb3JpdHkgb3JkZXIgYXMgZm9sbG93czoKKyAgICAgICAgZXhwYW5kU3Bh Y2UoZml4ZWRDb2x1bW5JbmRleGVzKTsKKyAgICAgICAgaWYgKGhhc1NwYWNlVG9EaXN0cmlidXRl KCkpCisgICAgICAgICAgICBleHBhbmRTcGFjZShwZXJjZW50Q29sdW1uSW5kZXhlcyk7CisgICAg ICAgIGlmIChoYXNTcGFjZVRvRGlzdHJpYnV0ZSgpKQorICAgICAgICAgICAgZXhwYW5kU3BhY2Uo cmVsYXRpdmVDb2x1bW5JbmRleGVzKTsKKyAgICAgICAgaWYgKGhhc1NwYWNlVG9EaXN0cmlidXRl KCkpCisgICAgICAgICAgICBleHBhbmRTcGFjZShhdXRvQ29sdW1uSW5kZXhlcyk7CisgICAgICAg IEFTU0VSVCghaGFzU3BhY2VUb0Rpc3RyaWJ1dGUoKSk7CisgICAgICAgIHJldHVybiBkaXN0cmli dXRlZFNwYWNlczsKICAgICB9CisgICAgLy8gQ2FuJ3QgYWNjb21vZGF0ZSB0aGUgcHJlZmVycmVk IHdpZHRoLiBMZXQncyB1c2UgdGhlIHByaW9yaXR5IGxpc3QgdG8gc2hyaW5rIGNvbHVtbnMuCisg ICAgYXV0byBzcGFjZU5lZWRlZCA9IC1zcGFjZVRvRGlzdHJpYnV0ZTsKKworICAgIGF1dG8gbmVl ZHNNb3JlU3BhY2UgPSBbJl0geworICAgICAgICBBU1NFUlQoc3BhY2VOZWVkZWQgPiAtTGF5b3V0 VW5pdDo6ZXBzaWxvbigpKTsKKyAgICAgICAgcmV0dXJuIHNwYWNlTmVlZGVkID4gTGF5b3V0VW5p dDo6ZXBzaWxvbigpOworICAgIH07CisKKyAgICBhdXRvIHNocmlua1NwYWNlID0gWyZdKGNvbnN0 IGF1dG8mIGNvbHVtbkluZGV4ZXMpIHsKKyAgICAgICAgYXV0byBhZGp1c3RhYmxlZFNwYWNlID0g R3JpZFNwYWNlIHsgfTsKKyAgICAgICAgZm9yIChhdXRvJiBjb2x1bW5JbmRleCA6IGNvbHVtbklu ZGV4ZXMpCisgICAgICAgICAgICBhZGp1c3RhYmxlZFNwYWNlICs9ICpyZXNvbHZlZEl0ZW1zW2Nv bHVtbkluZGV4XTsKKworICAgICAgICBhdXRvIGNvbHVtbnNGbGV4QmFzZSA9IGFkanVzdGFibGVk U3BhY2UuZmxleEJhc2UgPyBzcGFjZU5lZWRlZCAvIGFkanVzdGFibGVkU3BhY2UuZmxleEJhc2Ug OiAwLmY7CisgICAgICAgIGZvciAoYXV0byYgY29sdW1uSW5kZXggOiBjb2x1bW5JbmRleGVzKSB7 CisgICAgICAgICAgICBhdXRvJiByZXNvbHZlZEl0ZW0gPSAqcmVzb2x2ZWRJdGVtc1tjb2x1bW5J bmRleF07CisgICAgICAgICAgICBhdXRvIHNwYWNlVG9SZW1vdmUgPSBzdGQ6Om1pbihyZXNvbHZl ZEl0ZW0ucHJlZmVycmVkU2l6ZSAtIHJlc29sdmVkSXRlbS5taW5pbXVtU2l6ZSwgY29sdW1uc0Zs ZXhCYXNlICogcmVzb2x2ZWRJdGVtLmZsZXhCYXNlKTsKKyAgICAgICAgICAgIHNwYWNlVG9SZW1v dmUgPSBzdGQ6Om1pbihzcGFjZVRvUmVtb3ZlLCBzcGFjZU5lZWRlZCk7CisgICAgICAgICAgICBk aXN0cmlidXRlZFNwYWNlc1tjb2x1bW5JbmRleF0gLT0gc3BhY2VUb1JlbW92ZTsKKyAgICAgICAg ICAgIHNwYWNlTmVlZGVkIC09IHNwYWNlVG9SZW1vdmU7CisgICAgICAgICAgICBpZiAoIW5lZWRz TW9yZVNwYWNlKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfTsK KyAgICBzaHJpbmtTcGFjZShhdXRvQ29sdW1uSW5kZXhlcyk7CisgICAgaWYgKG5lZWRzTW9yZVNw YWNlKCkpCisgICAgICAgIHNocmlua1NwYWNlKHJlbGF0aXZlQ29sdW1uSW5kZXhlcyk7CisgICAg aWYgKG5lZWRzTW9yZVNwYWNlKCkpCisgICAgICAgIHNocmlua1NwYWNlKGZpeGVkQ29sdW1uSW5k ZXhlcyk7CisgICAgaWYgKG5lZWRzTW9yZVNwYWNlKCkpCisgICAgICAgIHNocmlua1NwYWNlKHBl cmNlbnRDb2x1bW5JbmRleGVzKTsKKyAgICBBU1NFUlQoIW5lZWRzTW9yZVNwYWNlKCkpOwogICAg IHJldHVybiBkaXN0cmlidXRlZFNwYWNlczsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGRmY2YzNTg5YjNkYjljYjkz MGU1NGEwMTFmNDY1MTQyMDRmMjYxN2EuLmZhOTcxZTA0Y2EyNDE3NDBkOTE4OWU3MTc3NDY0NGY0 ZDhiNTlhZDQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNy0wMiAgQWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBBZGQgc3VwcG9ydCBmb3Ig cHJpb3JpdHkgbGlzdCBvZiB3aWR0aCB0eXBlcyB3aGVuIGV4cGFuZGluZyBjb2x1bW5zCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc2MjcKKworICAg ICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICAqIGZhc3QvbGF5b3V0 Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lkdGgtdHlwZS1zaW1wbGUzLWV4 cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRl eHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lkdGgtdHlwZS1zaW1wbGUzLmh0bWw6IEFkZGVkLgorCiAy MDIxLTA3LTAxICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CiAKICAgICAgICAg W0NvY29hXSBMYXN0IGZldyBzZWNvbmRzIG9mICdhdWRpby93ZWJtOyBjb2RlY3M9dm9yYmlzJyBh cHBlbmRlZCB0byBhIFNhbXBsZUJ1ZmZlciBhcmUgbm90IHBsYXllZApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zcGFjZS1taXhlZC13 aWR0aC10eXBlLXNpbXBsZTMtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0 Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lkdGgtdHlwZS1zaW1wbGUzLWV4 cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDc4ZDIzZmU2MzBlN2I0Y2I0YjhhYzUyZDFiYTkwZDM4 NmU2YzY0YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0 dGluZ2NvbnRleHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lkdGgtdHlwZS1zaW1wbGUzLWV4cGVjdGVk Lmh0bWwKQEAgLTAsMCArMSwyNSBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3Qt cnVubmVyIFsgTGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRFbmFibGVkPXRydWUgTGF5b3V0Rm9ybWF0 dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQ9ZmFsc2UgXSAtLT4KKzxzdHlsZT4KK2JvZHkg eworICBmb250LXNpemU6IDE2cHg7CisgIG92ZXJmbG93OiBoaWRkZW47Cit9CisKK2RpdiB7Cisg IGhlaWdodDogMjBweDsKKyAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsKK30KKworLmlubmVyIHsK KyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9Cis8L3N0eWxlPgorCis8ZGl2IHN0eWxlPSJ3 aWR0aDogMTAwcHgiPjxkaXYgY2xhc3M9aW5uZXIgc3R5bGU9IndpZHRoOiA1MHB4Ij48L2Rpdj48 L2Rpdj4KKzxkaXYgc3R5bGU9IndpZHRoOiA1MDBweCI+PGRpdiBjbGFzcz1pbm5lciBzdHlsZT0i d2lkdGg6IDUwMHB4Ij48L2Rpdj48L2Rpdj4KKzxkaXYgc3R5bGU9IndpZHRoOiA1MDBweCI+PGRp diBjbGFzcz1pbm5lciBzdHlsZT0id2lkdGg6IDU2cHgiPjwvZGl2PjwvZGl2PgorPGRpdiBzdHls ZT0id2lkdGg6IDUwMHB4Ij48ZGl2IGNsYXNzPWlubmVyIHN0eWxlPSJ3aWR0aDogNTAwcHgiPjwv ZGl2PjwvZGl2PgorPGRpdiBzdHlsZT0id2lkdGg6IDUwMHB4Ij48ZGl2IGNsYXNzPWlubmVyIHN0 eWxlPSJ3aWR0aDogNXB4Ij48L2Rpdj48L2Rpdj4KKzxkaXYgc3R5bGU9IndpZHRoOiA1MDBweCI+ PGRpdiBjbGFzcz1pbm5lciBzdHlsZT0id2lkdGg6IDI1MHB4Ij48L2Rpdj48L2Rpdj4KKzxkaXYg c3R5bGU9IndpZHRoOiA0MjlweDsgaGVpZ2h0OiAzMHB4OyI+PGRpdiBjbGFzcz1pbm5lciBzdHls ZT0id2lkdGg6IDMwMHB4OyBoZWlnaHQ6IDMwcHg7Ij48L2Rpdj48L2Rpdj4KKzxkaXYgc3R5bGU9 IndpZHRoOiA1MDBweDsgaGVpZ2h0OiAzMHB4OyI+PGRpdiBjbGFzcz1pbm5lciBzdHlsZT0id2lk dGg6IDUwMHB4OyBoZWlnaHQ6IDMwcHg7Ij48L2Rpdj48L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lk dGgtdHlwZS1zaW1wbGUzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdj b250ZXh0L3RhYmxlLXNwYWNlLW1peGVkLXdpZHRoLXR5cGUtc2ltcGxlMy5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjkyZjJhMjFhNjdhNDA1NWYwYzI2YTI2MjI0OTI1MTg2NTk1NjFhNWEKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXNw YWNlLW1peGVkLXdpZHRoLXR5cGUtc2ltcGxlMy5odG1sCkBAIC0wLDAgKzEsNTYgQEAKKzwhRE9D VFlQRSBodG1sPjwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgTGF5b3V0Rm9ybWF0dGluZ0NvbnRl eHRFbmFibGVkPXRydWUgTGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQ9 ZmFsc2UgXSAtLT4KKzxzdHlsZT4KK3RkIHsKKyAgaGVpZ2h0OiAxMHB4OworICBiYWNrZ3JvdW5k LWNvbG9yOiBibHVlOworICBwYWRkaW5nOiAwcHg7Cit9CisKK3RhYmxlIHsKKyAgYm9yZGVyLXNw YWNpbmc6IDBweDsKK30KKworYm9keSB7CisgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOworfQor Cit0ZDpudGgtY2hpbGQob2RkKSB7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworfQorPC9z dHlsZT4KKzxkaXYgc3R5bGU9IndpZHRoOiA1MDBweDsiPgorPHRhYmxlPgorPHRyPjx0ZCBzdHls ZT0id2lkdGg6IDEwcHg7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDEwJTsiPjwvdGQ+PC90cj4K Kzx0cj48dGQgc3R5bGU9IndpZHRoOiAxMCU7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDEwcHg7 Ij48L3RkPjwvdHI+Cis8L3RhYmxlPgorPHRhYmxlPgorPHRyPjx0ZCBzdHlsZT0id2lkdGg6IDEw MHB4OyI+PC90ZD48dGQgc3R5bGU9IndpZHRoOiAxMDAlOyI+PC90ZD48L3RyPgorPHRyPjx0ZCBz dHlsZT0id2lkdGg6IDEwMCU7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDEwMHB4OyI+PC90ZD48 L3RyPgorPC90YWJsZT4KKzx0YWJsZT4KKzx0cj48dGQgc3R5bGU9IndpZHRoOiA4MHB4OyI+PC90 ZD48dGQgc3R5bGU9IndpZHRoOiAyMDBweDsiPjwvdGQ+PC90cj4KKzx0cj48dGQgc3R5bGU9Indp ZHRoOiAxMCU7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDgwJTsiPjwvdGQ+PC90cj4KKzwvdGFi bGU+Cis8dGFibGU+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogODBweDsiPjwvdGQ+PHRkIHN0eWxl PSJ3aWR0aDogMTAlOyI+PC90ZD48L3RyPgorPHRyPjx0ZCBzdHlsZT0id2lkdGg6IDEwMCU7Ij48 L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDIwMHB4OyI+PC90ZD48L3RyPgorPC90YWJsZT4KKzx0YWJs ZT4KKzx0cj48dGQgc3R5bGU9IndpZHRoOiAxMDAwcHg7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6 IDEwMDAlOyI+PC90ZD48L3RyPgorPHRyPjx0ZCBzdHlsZT0id2lkdGg6IDElOyI+PC90ZD48dGQg c3R5bGU9IndpZHRoOiAxcHg7Ij48L3RkPjwvdHI+Cis8L3RhYmxlPgorPHRhYmxlPgorPHRyPjx0 ZCBzdHlsZT0id2lkdGg6IDI1MHB4OyI+PC90ZD48dGQgc3R5bGU9IndpZHRoOiA1MCU7Ij48L3Rk PjwvdHI+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogNTAwcHg7Ij48L3RkPjx0ZCBzdHlsZT0id2lk dGg6IDAlOyI+PC90ZD48L3RyPgorPC90YWJsZT4KKzx0YWJsZT4KKzx0cj48dGQgc3R5bGU9Indp ZHRoOiAxMDBweDsiPjwvdGQ+PHRkIHN0eWxlPSJ3aWR0aDogMTAlOyI+PC90ZD48L3RyPgorPHRy Pjx0ZCBzdHlsZT0id2lkdGg6IDIwMHB4OyI+PC90ZD48dGQgc3R5bGU9IndpZHRoOiAyMCU7Ij48 L3RkPjwvdHI+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogMzAwcHg7Ij48L3RkPjx0ZCBzdHlsZT0i d2lkdGg6IDMwJTsiPjwvdGQ+PC90cj4KKzwvdGFibGU+Cis8dGFibGU+Cis8dHI+PHRkIHN0eWxl PSJ3aWR0aDogMTAwcHg7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDEwJTsiPjwvdGQ+PC90cj4K Kzx0cj48dGQgc3R5bGU9IndpZHRoOiAyMDAlOyI+PC90ZD48dGQgc3R5bGU9IndpZHRoOiAyMDBw eDsiPjwvdGQ+PC90cj4KKzx0cj48dGQgc3R5bGU9IndpZHRoOiAzMDBweDsiPjwvdGQ+PHRkIHN0 eWxlPSJ3aWR0aDogMzAlOyI+PC90ZD48L3RyPgorPC90YWJsZT4KKzwvZGl2Pgo= 432850 2021-07-03 06:21:54 -0700 2021-07-03 07:17:45 -0700 Patch bug-227627-20210703062153.patch text/plain 13727 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmIxMTFhMzRhOWY3ZjE1 MjhhYTg0MjUwNTM1ZTI5MjQ3N2Q2NjRiMy4uMWY3YmE2ZDJlYmYwZWYwNjhmNjIxNzBkOTU4M2Vh M2U3M2M2MjhjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA3LTAzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIEFkZCBzdXBw b3J0IGZvciBwcmlvcml0eSBsaXN0IG9mIHdpZHRoIHR5cGVzIHdoZW4gZXhwYW5kaW5nIGNvbHVt bnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzYy NworCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFdoZW4g ZXhwYW5kaW5nIHRoZSBjb2x1bW5zIHRvIHVzZSB0aGUgZXh0cmEgc3BhY2UgYXZhaWxhYmxlLCB3 ZSBuZWVkIHRvIHByaW9yaXRpemUgY2VydGFpbiBjb2x1bW5zCisgICAgICAgIHdpdGggc3BlY2lm aWMgd2lkdGggdHlwZXM6IGZpeGVkID4gcGVyY2VudCA+IHJlbGF0aXZlID4gYXV0bworICAgICAg ICBUaGlzIGlzIF9hbG1vc3RfIHRoZSByZXZlcnNlZCB2ZXJzaW9uIG9mIHRoZSBzaHJpbmtpbmcg cHJpb3JpdHkgbGlzdCAoYnV0IG5vdCBxdWl0ZSkuCisgICAgICAgIE5vdyB3ZSBjYW4gaGF2ZSBt aXhlZCBjb2x1bW4gdHlwZXMgYWNyb3NzIG11bHRpcGxlIHJvd3Mgd2l0aCBleHBhbmRpbmcgYW5k IHNocmlua2luZyBjb2x1bW5zLgorCisgICAgICAgIFRlc3Q6IGZhc3QvbGF5b3V0Zm9ybWF0dGlu Z2NvbnRleHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lkdGgtdHlwZS1zaW1wbGUzLmh0bWwKKworICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVMYXlvdXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpkaXN0cmlidXRlQXZhaWxhYmxlU3BhY2UpOgorCiAy MDIxLTA3LTAyICBKb29uZ2h1biBQYXJrICA8amg3MTgucGFya0BzYW1zdW5nLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkLiBSZW1vdmUgdGhlIGJ1aWxkIHdhcm5pbmcgYmVsb3cgc2luY2UgcjI3 OTQ5OC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCmlu ZGV4IDJjZGMwOTE5MmVjY2NkYTc3ZWRlNjU2ZWRhZTVkMTg0MTIyM2Q3MDEuLmViNGVlY2VjNmEy ZGUxZDJlNzE5Zjk3YmY4OTAxZWE5YjAxYTZmNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9U YWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNDY0LDcgKzQ2NCw2IEBAIEludHJpbnNpY1dp ZHRoQ29uc3RyYWludHMgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRQcmVmZXJyZWRX aWR0aEZvckNvbHVtCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBhdXRvIHBlcmNlbnQgPSBzdGQ6Om1pbigqbWF4aW11bVBlcmNlbnRDb2x1bW5X aWR0aHNbY29sdW1uSW5kZXhdLCByZW1haW5pbmdQZXJjZW50KTsKLSAgICAgICAgICAgIEFTU0VS VChwZXJjZW50ID4gMCk7CiAgICAgICAgICAgICBjb2x1bW5MaXN0W2NvbHVtbkluZGV4XS5zZXRD b21wdXRlZExvZ2ljYWxXaWR0aCh7IHBlcmNlbnQsIExlbmd0aFR5cGU6OlBlcmNlbnQgfSk7CiAg ICAgICAgICAgICBwZXJjZW50TWF4aW11bVdpZHRoID0gc3RkOjptYXgocGVyY2VudE1heGltdW1X aWR0aCwgTGF5b3V0VW5pdCB7IG5vblBlcmNlbnRDb2x1bW5XaWR0aCAqIDEwMC4wZiAvIHBlcmNl bnQgfSk7CiAgICAgICAgICAgICByZW1haW5pbmdQZXJjZW50IC09IHBlcmNlbnQ7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxl TGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFi bGUvVGFibGVMYXlvdXQuY3BwCmluZGV4IDA5Y2U0Nzc2NDdmNzQ3ODM0ZDE5NmVkMmQ5N2JlZWQx OTljOTNjYzMuLmVmOGJlYTYwM2Q2MmRiNWU1ZmNjNGE1YTIyNzI1Y2FiZmU4Y2VlYzcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvdGFibGUvVGFi bGVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvdGFibGUvVGFibGVMYXlvdXQuY3BwCkBAIC0yMjQsNjYgKzIyNCwxMDEgQEAgc3RhdGljIFZl Y3RvcjxMYXlvdXRVbml0PiBkaXN0cmlidXRlQXZhaWxhYmxlU3BhY2UoY29uc3QgVGFibGVHcmlk JiBncmlkLCBMYXlvdXQKICAgICBmb3IgKHNpemVfdCBjb2x1bW5JbmRleCA9IDA7IGNvbHVtbklu ZGV4IDwgcmVzb2x2ZWRJdGVtcy5zaXplKCk7ICsrY29sdW1uSW5kZXgpCiAgICAgICAgIGRpc3Ry aWJ1dGVkU3BhY2VzW2NvbHVtbkluZGV4XSA9IExheW91dFVuaXQgeyByZXNvbHZlZEl0ZW1zW2Nv bHVtbkluZGV4XS0+cHJlZmVycmVkU2l6ZSB9OwogCisgICAgaWYgKCFzcGFjZVRvRGlzdHJpYnV0 ZSkgeworICAgICAgICAvLyBQcmVmZXJyZWQgc2l6ZSBjb3ZlcnMgdGhlIHNwYWNlcy4gVGhlcmUn cyBub3RoaW5nIGV4dHJhIHNwYWFjZSB0byBkaXN0cmlidXRlLgorICAgICAgICByZXR1cm4gZGlz dHJpYnV0ZWRTcGFjZXM7CisgICAgfQorCisgICAgLy8gU2V0dXAgdGhlIHByaW9yaXR5IGxpc3Rz LiBXZSB1c2UgdGhlc2Ugd2hlbiBleHBhbmRpbmcvc2hyaW5raW5nIHNsb3RzLgorICAgIFZlY3Rv cjxzaXplX3Q+IGF1dG9Db2x1bW5JbmRleGVzOworICAgIFZlY3RvcjxzaXplX3Q+IHJlbGF0aXZl Q29sdW1uSW5kZXhlczsKKyAgICBWZWN0b3I8c2l6ZV90PiBmaXhlZENvbHVtbkluZGV4ZXM7Cisg ICAgVmVjdG9yPHNpemVfdD4gcGVyY2VudENvbHVtbkluZGV4ZXM7CisKKyAgICBmb3IgKHNpemVf dCBjb2x1bW5JbmRleCA9IDA7IGNvbHVtbkluZGV4IDwgcmVzb2x2ZWRJdGVtcy5zaXplKCk7ICsr Y29sdW1uSW5kZXgpIHsKKyAgICAgICAgc3dpdGNoIChyZXNvbHZlZEl0ZW1zW2NvbHVtbkluZGV4 XS0+dHlwZSkgeworICAgICAgICBjYXNlIEdyaWRTcGFjZTo6VHlwZTo6UGVyY2VudDoKKyAgICAg ICAgICAgIHBlcmNlbnRDb2x1bW5JbmRleGVzLmFwcGVuZChjb2x1bW5JbmRleCk7CisgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgY2FzZSBHcmlkU3BhY2U6OlR5cGU6OkZpeGVkOgorICAgICAg ICAgICAgZml4ZWRDb2x1bW5JbmRleGVzLmFwcGVuZChjb2x1bW5JbmRleCk7CisgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgY2FzZSBHcmlkU3BhY2U6OlR5cGU6OlJlbGF0aXZlOgorICAgICAg ICAgICAgcmVsYXRpdmVDb2x1bW5JbmRleGVzLmFwcGVuZChjb2x1bW5JbmRleCk7CisgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgY2FzZSBHcmlkU3BhY2U6OlR5cGU6OkF1dG86CisgICAgICAg ICAgICBhdXRvQ29sdW1uSW5kZXhlcy5hcHBlbmQoY29sdW1uSW5kZXgpOworICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorCiAgICAgaWYgKHNwYWNl VG9EaXN0cmlidXRlID4gMCkgewogICAgICAgICAvLyBFYWNoIGNvbHVtbiBjYW4gZ2V0IHNvbWUg ZXh0cmEgc3BhY2UuCi0gICAgICAgIGF1dG8gY29sdW1uc0ZsZXhCYXNlID0gYWRqdXN0YWJsZWRT cGFjZS5mbGV4QmFzZSA/IHNwYWNlVG9EaXN0cmlidXRlIC8gYWRqdXN0YWJsZWRTcGFjZS5mbGV4 QmFzZSA6IDAuZjsKLSAgICAgICAgZm9yIChzaXplX3QgY29sdW1uSW5kZXggPSAwOyBjb2x1bW5J bmRleCA8IHJlc29sdmVkSXRlbXMuc2l6ZSgpOyArK2NvbHVtbkluZGV4KSB7Ci0gICAgICAgICAg ICBhdXRvIGNvbHVtbkV4dHJhU3BhY2UgPSBjb2x1bW5zRmxleEJhc2UgKiByZXNvbHZlZEl0ZW1z W2NvbHVtbkluZGV4XS0+ZmxleEJhc2U7Ci0gICAgICAgICAgICBkaXN0cmlidXRlZFNwYWNlc1tj b2x1bW5JbmRleF0gKz0gTGF5b3V0VW5pdCB7IGNvbHVtbkV4dHJhU3BhY2UgfTsKLSAgICAgICAg fQotICAgIH0gZWxzZSBpZiAoc3BhY2VUb0Rpc3RyaWJ1dGUgPCAwKSB7Ci0gICAgICAgIC8vIENh bid0IGFjY29tb2RhdGUgdGhlIHByZWZlcnJlZCB3aWR0aC4gTGV0J3MgdXNlIHRoZSBwcmlvcml0 eSBsaXN0IHRvIHNocmluayBjb2x1bW5zLgotICAgICAgICBWZWN0b3I8c2l6ZV90PiBhdXRvQ29s dW1uSW5kZXhlczsKLSAgICAgICAgVmVjdG9yPHNpemVfdD4gcmVsYXRpdmVDb2x1bW5JbmRleGVz OwotICAgICAgICBWZWN0b3I8c2l6ZV90PiBmaXhlZENvbHVtbkluZGV4ZXM7Ci0gICAgICAgIFZl Y3RvcjxzaXplX3Q+IHBlcmNlbnRDb2x1bW5JbmRleGVzOwotCi0gICAgICAgIGZvciAoc2l6ZV90 IGNvbHVtbkluZGV4ID0gMDsgY29sdW1uSW5kZXggPCByZXNvbHZlZEl0ZW1zLnNpemUoKTsgKytj b2x1bW5JbmRleCkgewotICAgICAgICAgICAgc3dpdGNoIChyZXNvbHZlZEl0ZW1zW2NvbHVtbklu ZGV4XS0+dHlwZSkgewotICAgICAgICAgICAgY2FzZSBHcmlkU3BhY2U6OlR5cGU6OlBlcmNlbnQ6 Ci0gICAgICAgICAgICAgICAgcGVyY2VudENvbHVtbkluZGV4ZXMuYXBwZW5kKGNvbHVtbkluZGV4 KTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgR3JpZFNwYWNlOjpU eXBlOjpGaXhlZDoKLSAgICAgICAgICAgICAgICBmaXhlZENvbHVtbkluZGV4ZXMuYXBwZW5kKGNv bHVtbkluZGV4KTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgR3Jp ZFNwYWNlOjpUeXBlOjpSZWxhdGl2ZToKLSAgICAgICAgICAgICAgICByZWxhdGl2ZUNvbHVtbklu ZGV4ZXMuYXBwZW5kKGNvbHVtbkluZGV4KTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIGNhc2UgR3JpZFNwYWNlOjpUeXBlOjpBdXRvOgotICAgICAgICAgICAgICAgIGF1dG9D b2x1bW5JbmRleGVzLmFwcGVuZChjb2x1bW5JbmRleCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICB9Cisg ICAgICAgIGF1dG8gaGFzU3BhY2VUb0Rpc3RyaWJ1dGUgPSBbJl0geworICAgICAgICAgICAgQVNT RVJUKHNwYWNlVG9EaXN0cmlidXRlID4gLUxheW91dFVuaXQ6OmVwc2lsb24oKSk7CisgICAgICAg ICAgICByZXR1cm4gc3BhY2VUb0Rpc3RyaWJ1dGUgPiBMYXlvdXRVbml0OjplcHNpbG9uKCk7Cisg ICAgICAgIH07CiAKLSAgICAgICAgYXV0byBzcGFjZU5lZWRlZCA9IC1zcGFjZVRvRGlzdHJpYnV0 ZTsKLSAgICAgICAgYXV0byBzaHJpbmtTcGFjZUZvclR5cGUgPSBbJl0oY29uc3QgYXV0byYgY29s dW1uSW5kZXhlcykgeworICAgICAgICBhdXRvIGV4cGFuZFNwYWNlID0gWyZdKGNvbnN0IGF1dG8m IGNvbHVtbkluZGV4ZXMpIHsKICAgICAgICAgICAgIGF1dG8gYWRqdXN0YWJsZWRTcGFjZSA9IEdy aWRTcGFjZSB7IH07CiAgICAgICAgICAgICBmb3IgKGF1dG8mIGNvbHVtbkluZGV4IDogY29sdW1u SW5kZXhlcykKICAgICAgICAgICAgICAgICBhZGp1c3RhYmxlZFNwYWNlICs9ICpyZXNvbHZlZEl0 ZW1zW2NvbHVtbkluZGV4XTsKIAotICAgICAgICAgICAgYXV0byBjb2x1bW5zRmxleEJhc2UgPSBh ZGp1c3RhYmxlZFNwYWNlLmZsZXhCYXNlID8gc3BhY2VOZWVkZWQgLyBhZGp1c3RhYmxlZFNwYWNl LmZsZXhCYXNlIDogMC5mOworICAgICAgICAgICAgYXV0byBjb2x1bW5zRmxleEJhc2UgPSBhZGp1 c3RhYmxlZFNwYWNlLmZsZXhCYXNlID8gc3BhY2VUb0Rpc3RyaWJ1dGUgLyBhZGp1c3RhYmxlZFNw YWNlLmZsZXhCYXNlIDogMC5mOwogICAgICAgICAgICAgZm9yIChhdXRvJiBjb2x1bW5JbmRleCA6 IGNvbHVtbkluZGV4ZXMpIHsKLSAgICAgICAgICAgICAgICBhdXRvJiByZXNvbHZlZEl0ZW0gPSAq cmVzb2x2ZWRJdGVtc1tjb2x1bW5JbmRleF07Ci0gICAgICAgICAgICAgICAgYXV0byBzcGFjZVRv UmVtb3ZlID0gc3RkOjptaW4ocmVzb2x2ZWRJdGVtLnByZWZlcnJlZFNpemUgLSByZXNvbHZlZEl0 ZW0ubWluaW11bVNpemUsIGNvbHVtbnNGbGV4QmFzZSAqIHJlc29sdmVkSXRlbS5mbGV4QmFzZSk7 Ci0gICAgICAgICAgICAgICAgc3BhY2VUb1JlbW92ZSA9IHN0ZDo6bWluKHNwYWNlVG9SZW1vdmUs IHNwYWNlTmVlZGVkKTsKLSAgICAgICAgICAgICAgICBkaXN0cmlidXRlZFNwYWNlc1tjb2x1bW5J bmRleF0gLT0gc3BhY2VUb1JlbW92ZTsKLSAgICAgICAgICAgICAgICBzcGFjZU5lZWRlZCAtPSBz cGFjZVRvUmVtb3ZlOwotICAgICAgICAgICAgICAgIGlmICghc3BhY2VOZWVkZWQpCisgICAgICAg ICAgICAgICAgYXV0byBleHRyYVNwYWNlID0gY29sdW1uc0ZsZXhCYXNlICogcmVzb2x2ZWRJdGVt c1tjb2x1bW5JbmRleF0tPmZsZXhCYXNlOworICAgICAgICAgICAgICAgIGRpc3RyaWJ1dGVkU3Bh Y2VzW2NvbHVtbkluZGV4XSArPSBMYXlvdXRVbml0IHsgZXh0cmFTcGFjZSB9OworICAgICAgICAg ICAgICAgIHNwYWNlVG9EaXN0cmlidXRlIC09IGV4dHJhU3BhY2U7CisgICAgICAgICAgICAgICAg aWYgKCFoYXNTcGFjZVRvRGlzdHJpYnV0ZSgpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBBU1NFUlQoc3BhY2VOZWVkZWQgPiAwKTsKICAg ICAgICAgfTsKLSAgICAgICAgc2hyaW5rU3BhY2VGb3JUeXBlKGF1dG9Db2x1bW5JbmRleGVzKTsK LSAgICAgICAgaWYgKHNwYWNlTmVlZGVkKQotICAgICAgICAgICAgc2hyaW5rU3BhY2VGb3JUeXBl KHJlbGF0aXZlQ29sdW1uSW5kZXhlcyk7Ci0gICAgICAgIGlmIChzcGFjZU5lZWRlZCkKLSAgICAg ICAgICAgIHNocmlua1NwYWNlRm9yVHlwZShmaXhlZENvbHVtbkluZGV4ZXMpOwotICAgICAgICBp ZiAoc3BhY2VOZWVkZWQpCi0gICAgICAgICAgICBzaHJpbmtTcGFjZUZvclR5cGUocGVyY2VudENv bHVtbkluZGV4ZXMpOworICAgICAgICAvLyBXZSBkaXN0cmlidXRlIHRoZSBleHRyYSBzcGFjZSBh bW9uZyBjb2x1bW5zIGluIHRoZSBwcmlvcml0eSBvcmRlciBhcyBmb2xsb3dzOgorICAgICAgICBl eHBhbmRTcGFjZShmaXhlZENvbHVtbkluZGV4ZXMpOworICAgICAgICBpZiAoaGFzU3BhY2VUb0Rp c3RyaWJ1dGUoKSkKKyAgICAgICAgICAgIGV4cGFuZFNwYWNlKHBlcmNlbnRDb2x1bW5JbmRleGVz KTsKKyAgICAgICAgaWYgKGhhc1NwYWNlVG9EaXN0cmlidXRlKCkpCisgICAgICAgICAgICBleHBh bmRTcGFjZShyZWxhdGl2ZUNvbHVtbkluZGV4ZXMpOworICAgICAgICBpZiAoaGFzU3BhY2VUb0Rp c3RyaWJ1dGUoKSkKKyAgICAgICAgICAgIGV4cGFuZFNwYWNlKGF1dG9Db2x1bW5JbmRleGVzKTsK KyAgICAgICAgQVNTRVJUKCFoYXNTcGFjZVRvRGlzdHJpYnV0ZSgpKTsKKyAgICAgICAgcmV0dXJu IGRpc3RyaWJ1dGVkU3BhY2VzOwogICAgIH0KKyAgICAvLyBDYW4ndCBhY2NvbW9kYXRlIHRoZSBw cmVmZXJyZWQgd2lkdGguIExldCdzIHVzZSB0aGUgcHJpb3JpdHkgbGlzdCB0byBzaHJpbmsgY29s dW1ucy4KKyAgICBhdXRvIHNwYWNlTmVlZGVkID0gLXNwYWNlVG9EaXN0cmlidXRlOworCisgICAg YXV0byBuZWVkc01vcmVTcGFjZSA9IFsmXSB7CisgICAgICAgIEFTU0VSVChzcGFjZU5lZWRlZCA+ IC1MYXlvdXRVbml0OjplcHNpbG9uKCkpOworICAgICAgICByZXR1cm4gc3BhY2VOZWVkZWQgPiBM YXlvdXRVbml0OjplcHNpbG9uKCk7CisgICAgfTsKKworICAgIGF1dG8gc2hyaW5rU3BhY2UgPSBb Jl0oY29uc3QgYXV0byYgY29sdW1uSW5kZXhlcykgeworICAgICAgICBhdXRvIGFkanVzdGFibGVk U3BhY2UgPSBHcmlkU3BhY2UgeyB9OworICAgICAgICBmb3IgKGF1dG8mIGNvbHVtbkluZGV4IDog Y29sdW1uSW5kZXhlcykKKyAgICAgICAgICAgIGFkanVzdGFibGVkU3BhY2UgKz0gKnJlc29sdmVk SXRlbXNbY29sdW1uSW5kZXhdOworCisgICAgICAgIGF1dG8gY29sdW1uc0ZsZXhCYXNlID0gYWRq dXN0YWJsZWRTcGFjZS5mbGV4QmFzZSA/IHNwYWNlTmVlZGVkIC8gYWRqdXN0YWJsZWRTcGFjZS5m bGV4QmFzZSA6IDAuZjsKKyAgICAgICAgZm9yIChhdXRvJiBjb2x1bW5JbmRleCA6IGNvbHVtbklu ZGV4ZXMpIHsKKyAgICAgICAgICAgIGF1dG8mIHJlc29sdmVkSXRlbSA9ICpyZXNvbHZlZEl0ZW1z W2NvbHVtbkluZGV4XTsKKyAgICAgICAgICAgIGF1dG8gc3BhY2VUb1JlbW92ZSA9IHN0ZDo6bWlu KHJlc29sdmVkSXRlbS5wcmVmZXJyZWRTaXplIC0gcmVzb2x2ZWRJdGVtLm1pbmltdW1TaXplLCBj b2x1bW5zRmxleEJhc2UgKiByZXNvbHZlZEl0ZW0uZmxleEJhc2UpOworICAgICAgICAgICAgc3Bh Y2VUb1JlbW92ZSA9IHN0ZDo6bWluKHNwYWNlVG9SZW1vdmUsIHNwYWNlTmVlZGVkKTsKKyAgICAg ICAgICAgIGRpc3RyaWJ1dGVkU3BhY2VzW2NvbHVtbkluZGV4XSAtPSBzcGFjZVRvUmVtb3ZlOwor ICAgICAgICAgICAgc3BhY2VOZWVkZWQgLT0gc3BhY2VUb1JlbW92ZTsKKyAgICAgICAgICAgIGlm ICghbmVlZHNNb3JlU3BhY2UoKSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICB9OworICAgIHNocmlua1NwYWNlKGF1dG9Db2x1bW5JbmRleGVzKTsKKyAgICBpZiAobmVl ZHNNb3JlU3BhY2UoKSkKKyAgICAgICAgc2hyaW5rU3BhY2UocmVsYXRpdmVDb2x1bW5JbmRleGVz KTsKKyAgICBpZiAobmVlZHNNb3JlU3BhY2UoKSkKKyAgICAgICAgc2hyaW5rU3BhY2UoZml4ZWRD b2x1bW5JbmRleGVzKTsKKyAgICBpZiAobmVlZHNNb3JlU3BhY2UoKSkKKyAgICAgICAgc2hyaW5r U3BhY2UocGVyY2VudENvbHVtbkluZGV4ZXMpOworICAgIEFTU0VSVCghbmVlZHNNb3JlU3BhY2Uo KSk7CiAgICAgcmV0dXJuIGRpc3RyaWJ1dGVkU3BhY2VzOwogfQogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNGU2ZTk2YzVm ZjAzZGY0MDMyMTY4MjYzMmYwMDY0ODBiNTZhZDA4OS4uMDUwZTNhZjRkZTMzNWUyMGVkM2U3NDk5 MGI3NDQ2MGE1ODllZmI4MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA3LTAzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIEFkZCBzdXBw b3J0IGZvciBwcmlvcml0eSBsaXN0IG9mIHdpZHRoIHR5cGVzIHdoZW4gZXhwYW5kaW5nIGNvbHVt bnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzYy NworCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgICogZmFz dC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zcGFjZS1taXhlZC13aWR0aC10eXBlLXNp bXBsZTMtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9sYXlvdXRmb3JtYXR0 aW5nY29udGV4dC90YWJsZS1zcGFjZS1taXhlZC13aWR0aC10eXBlLXNpbXBsZTMuaHRtbDogQWRk ZWQuCisKIDIwMjEtMDctMDIgIEVyaWMgSHV0Y2hpc29uICA8ZWh1dGNoaXNvbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW0JpZ1N1ciBSZWxlYXNlIHdrMl0gZmFzdC9oaXN0b3J5L3Zpc2l0ZWQtaHJl Zi1tdXRhdGlvbi5odG1sIGlzIGEgZmxha3kgaW1hZ2UgZmFpbHVyZQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zcGFjZS1taXhlZC13 aWR0aC10eXBlLXNpbXBsZTMtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0 Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lkdGgtdHlwZS1zaW1wbGUzLWV4 cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDc4ZDIzZmU2MzBlN2I0Y2I0YjhhYzUyZDFiYTkwZDM4 NmU2YzY0YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0 dGluZ2NvbnRleHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lkdGgtdHlwZS1zaW1wbGUzLWV4cGVjdGVk Lmh0bWwKQEAgLTAsMCArMSwyNSBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3Qt cnVubmVyIFsgTGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRFbmFibGVkPXRydWUgTGF5b3V0Rm9ybWF0 dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQ9ZmFsc2UgXSAtLT4KKzxzdHlsZT4KK2JvZHkg eworICBmb250LXNpemU6IDE2cHg7CisgIG92ZXJmbG93OiBoaWRkZW47Cit9CisKK2RpdiB7Cisg IGhlaWdodDogMjBweDsKKyAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsKK30KKworLmlubmVyIHsK KyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9Cis8L3N0eWxlPgorCis8ZGl2IHN0eWxlPSJ3 aWR0aDogMTAwcHgiPjxkaXYgY2xhc3M9aW5uZXIgc3R5bGU9IndpZHRoOiA1MHB4Ij48L2Rpdj48 L2Rpdj4KKzxkaXYgc3R5bGU9IndpZHRoOiA1MDBweCI+PGRpdiBjbGFzcz1pbm5lciBzdHlsZT0i d2lkdGg6IDUwMHB4Ij48L2Rpdj48L2Rpdj4KKzxkaXYgc3R5bGU9IndpZHRoOiA1MDBweCI+PGRp diBjbGFzcz1pbm5lciBzdHlsZT0id2lkdGg6IDU2cHgiPjwvZGl2PjwvZGl2PgorPGRpdiBzdHls ZT0id2lkdGg6IDUwMHB4Ij48ZGl2IGNsYXNzPWlubmVyIHN0eWxlPSJ3aWR0aDogNTAwcHgiPjwv ZGl2PjwvZGl2PgorPGRpdiBzdHlsZT0id2lkdGg6IDUwMHB4Ij48ZGl2IGNsYXNzPWlubmVyIHN0 eWxlPSJ3aWR0aDogNXB4Ij48L2Rpdj48L2Rpdj4KKzxkaXYgc3R5bGU9IndpZHRoOiA1MDBweCI+ PGRpdiBjbGFzcz1pbm5lciBzdHlsZT0id2lkdGg6IDI1MHB4Ij48L2Rpdj48L2Rpdj4KKzxkaXYg c3R5bGU9IndpZHRoOiA0MjlweDsgaGVpZ2h0OiAzMHB4OyI+PGRpdiBjbGFzcz1pbm5lciBzdHls ZT0id2lkdGg6IDMwMHB4OyBoZWlnaHQ6IDMwcHg7Ij48L2Rpdj48L2Rpdj4KKzxkaXYgc3R5bGU9 IndpZHRoOiA1MDBweDsgaGVpZ2h0OiAzMHB4OyI+PGRpdiBjbGFzcz1pbm5lciBzdHlsZT0id2lk dGg6IDUwMHB4OyBoZWlnaHQ6IDMwcHg7Ij48L2Rpdj48L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc3BhY2UtbWl4ZWQtd2lk dGgtdHlwZS1zaW1wbGUzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdj b250ZXh0L3RhYmxlLXNwYWNlLW1peGVkLXdpZHRoLXR5cGUtc2ltcGxlMy5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjkyZjJhMjFhNjdhNDA1NWYwYzI2YTI2MjI0OTI1MTg2NTk1NjFhNWEKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXNw YWNlLW1peGVkLXdpZHRoLXR5cGUtc2ltcGxlMy5odG1sCkBAIC0wLDAgKzEsNTYgQEAKKzwhRE9D VFlQRSBodG1sPjwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgTGF5b3V0Rm9ybWF0dGluZ0NvbnRl eHRFbmFibGVkPXRydWUgTGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQ9 ZmFsc2UgXSAtLT4KKzxzdHlsZT4KK3RkIHsKKyAgaGVpZ2h0OiAxMHB4OworICBiYWNrZ3JvdW5k LWNvbG9yOiBibHVlOworICBwYWRkaW5nOiAwcHg7Cit9CisKK3RhYmxlIHsKKyAgYm9yZGVyLXNw YWNpbmc6IDBweDsKK30KKworYm9keSB7CisgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOworfQor Cit0ZDpudGgtY2hpbGQob2RkKSB7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworfQorPC9z dHlsZT4KKzxkaXYgc3R5bGU9IndpZHRoOiA1MDBweDsiPgorPHRhYmxlPgorPHRyPjx0ZCBzdHls ZT0id2lkdGg6IDEwcHg7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDEwJTsiPjwvdGQ+PC90cj4K Kzx0cj48dGQgc3R5bGU9IndpZHRoOiAxMCU7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDEwcHg7 Ij48L3RkPjwvdHI+Cis8L3RhYmxlPgorPHRhYmxlPgorPHRyPjx0ZCBzdHlsZT0id2lkdGg6IDEw MHB4OyI+PC90ZD48dGQgc3R5bGU9IndpZHRoOiAxMDAlOyI+PC90ZD48L3RyPgorPHRyPjx0ZCBz dHlsZT0id2lkdGg6IDEwMCU7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDEwMHB4OyI+PC90ZD48 L3RyPgorPC90YWJsZT4KKzx0YWJsZT4KKzx0cj48dGQgc3R5bGU9IndpZHRoOiA4MHB4OyI+PC90 ZD48dGQgc3R5bGU9IndpZHRoOiAyMDBweDsiPjwvdGQ+PC90cj4KKzx0cj48dGQgc3R5bGU9Indp ZHRoOiAxMCU7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDgwJTsiPjwvdGQ+PC90cj4KKzwvdGFi bGU+Cis8dGFibGU+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogODBweDsiPjwvdGQ+PHRkIHN0eWxl PSJ3aWR0aDogMTAlOyI+PC90ZD48L3RyPgorPHRyPjx0ZCBzdHlsZT0id2lkdGg6IDEwMCU7Ij48 L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDIwMHB4OyI+PC90ZD48L3RyPgorPC90YWJsZT4KKzx0YWJs ZT4KKzx0cj48dGQgc3R5bGU9IndpZHRoOiAxMDAwcHg7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6 IDEwMDAlOyI+PC90ZD48L3RyPgorPHRyPjx0ZCBzdHlsZT0id2lkdGg6IDElOyI+PC90ZD48dGQg c3R5bGU9IndpZHRoOiAxcHg7Ij48L3RkPjwvdHI+Cis8L3RhYmxlPgorPHRhYmxlPgorPHRyPjx0 ZCBzdHlsZT0id2lkdGg6IDI1MHB4OyI+PC90ZD48dGQgc3R5bGU9IndpZHRoOiA1MCU7Ij48L3Rk PjwvdHI+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogNTAwcHg7Ij48L3RkPjx0ZCBzdHlsZT0id2lk dGg6IDAlOyI+PC90ZD48L3RyPgorPC90YWJsZT4KKzx0YWJsZT4KKzx0cj48dGQgc3R5bGU9Indp ZHRoOiAxMDBweDsiPjwvdGQ+PHRkIHN0eWxlPSJ3aWR0aDogMTAlOyI+PC90ZD48L3RyPgorPHRy Pjx0ZCBzdHlsZT0id2lkdGg6IDIwMHB4OyI+PC90ZD48dGQgc3R5bGU9IndpZHRoOiAyMCU7Ij48 L3RkPjwvdHI+Cis8dHI+PHRkIHN0eWxlPSJ3aWR0aDogMzAwcHg7Ij48L3RkPjx0ZCBzdHlsZT0i d2lkdGg6IDMwJTsiPjwvdGQ+PC90cj4KKzwvdGFibGU+Cis8dGFibGU+Cis8dHI+PHRkIHN0eWxl PSJ3aWR0aDogMTAwcHg7Ij48L3RkPjx0ZCBzdHlsZT0id2lkdGg6IDEwJTsiPjwvdGQ+PC90cj4K Kzx0cj48dGQgc3R5bGU9IndpZHRoOiAyMDAlOyI+PC90ZD48dGQgc3R5bGU9IndpZHRoOiAyMDBw eDsiPjwvdGQ+PC90cj4KKzx0cj48dGQgc3R5bGU9IndpZHRoOiAzMDBweDsiPjwvdGQ+PHRkIHN0 eWxlPSJ3aWR0aDogMzAlOyI+PC90ZD48L3RyPgorPC90YWJsZT4KKzwvZGl2Pgo=