240319 2022-05-11 15:24:42 -0700 TextBoxPainter::paintForeground: painting text with no marking/decoration should be simple 2022-05-12 17:33:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1868232 0 zalan 2022-05-11 15:24:42 -0700 ssia 1868233 1 459185 zalan 2022-05-11 15:32:01 -0700 Created attachment 459185 Patch 1868234 2 459185 simon.fraser 2022-05-11 15:37:37 -0700 Comment on attachment 459185 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459185&action=review > Source/WebCore/rendering/TextBoxPainter.cpp:191 > + , StyledMarkedText::computeStyleForUnmarkedMarkedText(m_renderer, lineStyle, m_isFirstLine, m_paintInfo) }); comma on previous line 1868378 3 459225 zalan 2022-05-12 06:37:31 -0700 Created attachment 459225 Patch 1868531 4 459247 zalan 2022-05-12 13:38:30 -0700 Created attachment 459247 Patch 1868566 5 459253 zalan 2022-05-12 15:30:14 -0700 Created attachment 459253 Patch 1868591 6 ews-feeder 2022-05-12 17:32:42 -0700 Committed r294128 (250505@main): <https://commits.webkit.org/250505@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459253. 1868592 7 webkit-bug-importer 2022-05-12 17:33:17 -0700 <rdar://problem/93212498> 459185 2022-05-11 15:32:01 -0700 2022-05-12 06:37:29 -0700 Patch bug-240319-20220511153159.patch text/plain 6283 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjgzYzRhMzAwMTlkN2U1 ODkyY2IxN2Y0MjhmOTMxYjUzMTFkMDNlOS4uODNiNzg4ZTBjZTc0YWM4YmMyNzJkZjU1MjRhZGZm YzFmMjYwMGJhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTA1LTExICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0Qm94UGFpbnRlcjo6cGFp bnRGb3JlZ3JvdW5kOiBwYWludGluZyB0ZXh0IHdpdGggbm8gbWFya2luZy9kZWNvcmF0aW9uIHNo b3VsZCBiZSBzaW1wbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI0MDMxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIExldCdzIGhhdmUgYSBmYXN0IGNvZGVwYXRoIGZvciByZWd1bGFyLCBzaW1wbGUgdGV4 dCBwYWludGluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9TdHlsZWRNYXJrZWRUZXh0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlZE1hcmtlZFRleHQ6OmNvbXB1dGVTdHlsZUZvclVubWFy a2VkTWFya2VkVGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlU3R5bGVGb3JVbm1hcmtl ZE1hcmtlZFRleHQpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9TdHlsZWRNYXJrZWRU ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWRNYXJrZWRUZXh0OjpTdHlsZWRNYXJrZWRU ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlZE1hcmtlZFRleHQ6OnN0eWxlKToKKyAgICAg ICAgKiByZW5kZXJpbmcvVGV4dEJveFBhaW50ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4 dEJveFBhaW50ZXI6OnBhaW50QmFja2dyb3VuZCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0Qm94 UGFpbnRlcjo6cGFpbnRGb3JlZ3JvdW5kQW5kRGVjb3JhdGlvbnMpOgorCiAyMDIyLTA1LTExICBB bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXh0Qm94UGFpbnRlcjo6 cGFpbnRCYWNrZ3JvdW5kIHNob3VsZCBiYWlsIG91dCBlYXJseSB3aGVuIG5vdGhpbmcgdG8gcGFp bnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TdHlsZWRNYXJrZWRUZXh0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TdHlsZWRNYXJrZWRUZXh0LmNwcAppbmRl eCA0ZTNjZGM3NGNhNTNhZDA2M2UwOTRiMjM4MTBjMTJlZTJlYWYyOGQ4Li40ZmZlNjcyMTY1NDMz ZTAxZGNmZWY4MjBhOTg5YTk0YTQ0NjgyMWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1N0eWxlZE1hcmtlZFRleHQuY3BwCkBAIC0xMTAsNyArMTEwLDcgQEAgc3RhdGljIFN0eWxl ZE1hcmtlZFRleHQgcmVzb2x2ZVN0eWxlRm9yTWFya2VkVGV4dChjb25zdCBNYXJrZWRUZXh0JiBt YXJrZWRUZXh0LAogICAgIHJldHVybiBzdHlsZWRNYXJrZWRUZXh0OwogfQogCi1zdGF0aWMgU3R5 bGVkTWFya2VkVGV4dDo6U3R5bGUgY29tcHV0ZVN0eWxlRm9yVW5tYXJrZWRNYXJrZWRUZXh0KGNv bnN0IFJlbmRlclRleHQmIHJlbmRlcmVyLCBjb25zdCBSZW5kZXJTdHlsZSYgbGluZVN0eWxlLCBi b29sIGlzRmlyc3RMaW5lLCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbykKK1N0eWxlZE1hcmtl ZFRleHQ6OlN0eWxlIFN0eWxlZE1hcmtlZFRleHQ6OmNvbXB1dGVTdHlsZUZvclVubWFya2VkTWFy a2VkVGV4dChjb25zdCBSZW5kZXJUZXh0JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5bGUmIGxp bmVTdHlsZSwgYm9vbCBpc0ZpcnN0TGluZSwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8pCiB7 CiAgICAgU3R5bGVkTWFya2VkVGV4dDo6U3R5bGUgc3R5bGU7CiAgICAgc3R5bGUudGV4dERlY29y YXRpb25TdHlsZXMgPSBUZXh0RGVjb3JhdGlvblBhaW50ZXI6OnN0eWxlc0ZvclJlbmRlcmVyKHJl bmRlcmVyLCBsaW5lU3R5bGUudGV4dERlY29yYXRpb25zSW5FZmZlY3QoKSwgaXNGaXJzdExpbmUp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1N0eWxlZE1hcmtlZFRleHQu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TdHlsZWRNYXJrZWRUZXh0LmgKaW5kZXggMjRl NmMyN2I2MzUxMjhhYzNiY2YyOGM3OTFkZGI3OTgzNGRiZjc4Ny4uMmJmM2I2MGY4NzE4ZTYxZjhh N2Y5MTg2MjUzNDVmN2MwNmRlNDA0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1N0eWxlZE1hcmtlZFRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU3R5 bGVkTWFya2VkVGV4dC5oCkBAIC0zNiwxMSArMzYsNiBAQCBjbGFzcyBSZW5kZXJUZXh0OwogY2xh c3MgUmVuZGVyZWREb2N1bWVudE1hcmtlcjsKIAogc3RydWN0IFN0eWxlZE1hcmtlZFRleHQgOiBN YXJrZWRUZXh0IHsKLSAgICBTdHlsZWRNYXJrZWRUZXh0KGNvbnN0IE1hcmtlZFRleHQmIG1hcmtl cikKLSAgICAgICAgOiBNYXJrZWRUZXh0IHsgbWFya2VyIH0KLSAgICB7Ci0gICAgfQotCiAgICAg c3RydWN0IFN0eWxlIHsKICAgICAgICAgQ29sb3IgYmFja2dyb3VuZENvbG9yOwogICAgICAgICBU ZXh0UGFpbnRTdHlsZSB0ZXh0U3R5bGVzOwpAQCAtNDksMTIgKzQ0LDI0IEBAIHN0cnVjdCBTdHls ZWRNYXJrZWRUZXh0IDogTWFya2VkVGV4dCB7CiAgICAgICAgIGZsb2F0IGFscGhhIHsgMSB9Owog ICAgIH07CiAKKyAgICBTdHlsZWRNYXJrZWRUZXh0KGNvbnN0IE1hcmtlZFRleHQmIG1hcmtlcikK KyAgICAgICAgOiBNYXJrZWRUZXh0IHsgbWFya2VyIH0KKyAgICB7CisgICAgfQorCisgICAgU3R5 bGVkTWFya2VkVGV4dChjb25zdCBNYXJrZWRUZXh0JiBtYXJrZXIsIFN0eWxlIHN0eWxlKQorICAg ICAgICA6IE1hcmtlZFRleHQgeyBtYXJrZXIgfQorICAgICAgICAsIHN0eWxlKHN0eWxlKQorICAg IHsKKyAgICB9CisKICAgICBTdHlsZSBzdHlsZTsKIAogICAgIHN0YXRpYyBWZWN0b3I8U3R5bGVk TWFya2VkVGV4dD4gc3ViZGl2aWRlQW5kUmVzb2x2ZShjb25zdCBWZWN0b3I8TWFya2VkVGV4dD4m LCBjb25zdCBSZW5kZXJUZXh0JiwgYm9vbCBpc0ZpcnN0TGluZSwgY29uc3QgUGFpbnRJbmZvJik7 CiAgICAgc3RhdGljIFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiBjb2FsZXNjZUFkamFjZW50V2l0 aEVxdWFsQmFja2dyb3VuZChjb25zdCBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4mKTsKICAgICBz dGF0aWMgVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+IGNvYWxlc2NlQWRqYWNlbnRXaXRoRXF1YWxG b3JlZ3JvdW5kKGNvbnN0IFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiYpOwogICAgIHN0YXRpYyBW ZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4gY29hbGVzY2VBZGphY2VudFdpdGhFcXVhbERlY29yYXRp b25zKGNvbnN0IFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiYpOworICAgIHN0YXRpYyBTdHlsZSBj b21wdXRlU3R5bGVGb3JVbm1hcmtlZE1hcmtlZFRleHQoY29uc3QgUmVuZGVyVGV4dCYsIGNvbnN0 IFJlbmRlclN0eWxlJiwgYm9vbCBpc0ZpcnN0TGluZSwgY29uc3QgUGFpbnRJbmZvJik7CiB9Owog CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEJveFBhaW50ZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcAppbmRleCAy N2ExMjQwZjBiMjg3MDM3ZTk1ODJhMTU4OWY1NWFiZDBmMDRlOGEwLi5kMzM4NmYwOTIzYTU1MjVl MzgwZmI3M2FkM2ZhMWM0NTk0OGYwMDc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvVGV4dEJveFBhaW50ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9U ZXh0Qm94UGFpbnRlci5jcHAKQEAgLTE3MSw3ICsxNzEsMjcgQEAgdm9pZCBUZXh0Qm94UGFpbnRl cjo6cGFpbnRCYWNrZ3JvdW5kKCkKIAogdm9pZCBUZXh0Qm94UGFpbnRlcjo6cGFpbnRGb3JlZ3Jv dW5kQW5kRGVjb3JhdGlvbnMoKQogewotICAgIGJvb2wgc2hvdWxkUGFpbnRTZWxlY3Rpb25Gb3Jl Z3JvdW5kID0gbV9oYXZlU2VsZWN0aW9uICYmICFtX3VzZUN1c3RvbVVuZGVybGluZXM7CisgICAg YXV0byBzaG91bGRQYWludFNlbGVjdGlvbkZvcmVncm91bmQgPSBtX2hhdmVTZWxlY3Rpb24gJiYg IW1fdXNlQ3VzdG9tVW5kZXJsaW5lczsKKyAgICBhdXRvIGhhc1RleHREZWNvcmF0aW9uID0gIW1f c3R5bGUudGV4dERlY29yYXRpb25zSW5FZmZlY3QoKS5pc0VtcHR5KCk7CisgICAgYXV0byBoYXNI aWdobGlnaHREZWNvcmF0aW9uID0gbV9kb2N1bWVudC5oYXNIaWdobGlnaHRSZWdpc3RlcigpICYm ICFNYXJrZWRUZXh0Ojpjb2xsZWN0Rm9ySGlnaGxpZ2h0cyhtX3JlbmRlcmVyLCBtX3NlbGVjdGFi bGVSYW5nZSwgTWFya2VkVGV4dDo6UGFpbnRQaGFzZTo6RGVjb3JhdGlvbikuaXNFbXB0eSgpOwor ICAgIGF1dG8gaGFzRGVjb3JhdGlvbiA9IGhhc1RleHREZWNvcmF0aW9uIHx8IGhhc0hpZ2hsaWdo dERlY29yYXRpb247CisKKyAgICBhdXRvIGNvbnRlbnRNYXlOZWVkU3R5bGVkTWFya2VkVGV4dCA9 IFsmXSB7CisgICAgICAgIGlmIChoYXNEZWNvcmF0aW9uKQorICAgICAgICAgICAgcmV0dXJuIHRy dWU7CisgICAgICAgIGlmIChzaG91bGRQYWludFNlbGVjdGlvbkZvcmVncm91bmQpCisgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgaWYgKG1fZG9jdW1lbnQubWFya2VycygpLmhhc01h cmtlcnMoKSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgfTsKKyAgICBpZiAoIWNvbnRlbnRNYXlOZWVkU3R5bGVkTWFya2VkVGV4dCgpKSB7Cisg ICAgICAgIGF1dG8mIGxpbmVTdHlsZSA9IG1faXNGaXJzdExpbmUgPyBtX3JlbmRlcmVyLmZpcnN0 TGluZVN0eWxlKCkgOiBtX3JlbmRlcmVyLnN0eWxlKCk7CisgICAgICAgIHBhaW50Rm9yZWdyb3Vu ZCh7IE1hcmtlZFRleHQgeyBtX3NlbGVjdGFibGVSYW5nZS5jbGFtcCh0ZXh0Qm94KCkuc3RhcnQo KSksIG1fc2VsZWN0YWJsZVJhbmdlLmNsYW1wKHRleHRCb3goKS5lbmQoKSksIE1hcmtlZFRleHQ6 OlVubWFya2VkIH0KKyAgICAgICAgICAgICwgU3R5bGVkTWFya2VkVGV4dDo6Y29tcHV0ZVN0eWxl Rm9yVW5tYXJrZWRNYXJrZWRUZXh0KG1fcmVuZGVyZXIsIGxpbmVTdHlsZSwgbV9pc0ZpcnN0TGlu ZSwgbV9wYWludEluZm8pIH0pOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgVmVjdG9y PE1hcmtlZFRleHQ+IG1hcmtlZFRleHRzOwogICAgIGlmIChtX3BhaW50SW5mby5waGFzZSAhPSBQ YWludFBoYXNlOjpTZWxlY3Rpb24pIHsKICAgICAgICAgLy8gVGhlIG1hcmtlZCB0ZXh0cyBmb3Ig dGhlIGdhcHMgYmV0d2VlbiBkb2N1bWVudCBtYXJrZXJzIGFuZCBzZWxlY3Rpb24gYXJlIGltcGxp Y2l0bHkgY3JlYXRlZCBieSBzdWJkaXZpZGluZyB0aGUgZW50aXJlIGxpbmUuCkBAIC0yMDgsMTAg KzIyOCw3IEBAIHZvaWQgVGV4dEJveFBhaW50ZXI6OnBhaW50Rm9yZWdyb3VuZEFuZERlY29yYXRp b25zKCkKICAgICAgICAgfSk7CiAgICAgfQogCi0gICAgYXV0byB0ZXh0RGVjb3JhdGlvbnMgPSBt X3N0eWxlLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCk7Ci0gICAgYm9vbCBoaWdobGlnaHREZWNv cmF0aW9ucyA9ICFNYXJrZWRUZXh0Ojpjb2xsZWN0Rm9ySGlnaGxpZ2h0cyhtX3JlbmRlcmVyLCBt X3NlbGVjdGFibGVSYW5nZSwgTWFya2VkVGV4dDo6UGFpbnRQaGFzZTo6RGVjb3JhdGlvbikuaXNF bXB0eSgpOwotICAgIGJvb2wgbGluZURlY29yYXRpb25zID0gIXRleHREZWNvcmF0aW9ucy5pc0Vt cHR5KCk7Ci0gICAgaWYgKChsaW5lRGVjb3JhdGlvbnMgfHwgaGlnaGxpZ2h0RGVjb3JhdGlvbnMp ICYmIG1fcGFpbnRJbmZvLnBoYXNlICE9IFBhaW50UGhhc2U6OlNlbGVjdGlvbikgeworICAgIGlm IChoYXNEZWNvcmF0aW9uICYmIG1fcGFpbnRJbmZvLnBoYXNlICE9IFBhaW50UGhhc2U6OlNlbGVj dGlvbikgewogICAgICAgICBUZXh0UnVuIHRleHRSdW4gPSB0ZXh0Qm94KCkuY3JlYXRlVGV4dFJ1 bigpOwogICAgICAgICB1bnNpZ25lZCBsZW5ndGggPSBtX3NlbGVjdGFibGVSYW5nZS50cnVuY2F0 aW9uLnZhbHVlX29yKHRleHRSdW4ubGVuZ3RoKCkpOwogICAgICAgICB1bnNpZ25lZCBzZWxlY3Rp b25TdGFydCA9IDA7Cg== 459225 2022-05-12 06:37:31 -0700 2022-05-12 13:38:29 -0700 Patch bug-240319-20220512063730.patch text/plain 6273 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjczNjE3NjVmM2MzNDJl Y2JjYzUxOGU3Nzk1ODU1MjVjZjM4ZjZiNi4uODljMjgxMDNjYTNkNzM5MjdiNDkwNTZiOWEwZjI3 NDA5YTJhYTc4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTA1LTEyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0Qm94UGFpbnRlcjo6cGFp bnRGb3JlZ3JvdW5kOiBwYWludGluZyB0ZXh0IHdpdGggbm8gbWFya2luZy9kZWNvcmF0aW9uIHNo b3VsZCBiZSBzaW1wbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI0MDMxOQorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAg ICAgICBMZXQncyBoYXZlIGEgZmFzdCBjb2RlcGF0aCBmb3IgcmVndWxhciwgc2ltcGxlIHRleHQg cGFpbnRpbmcuCisKKyAgICAgICAgKiByZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdHlsZWRNYXJrZWRUZXh0Ojpjb21wdXRlU3R5bGVGb3JVbm1hcmtl ZE1hcmtlZFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZVN0eWxlRm9yVW5tYXJrZWRN YXJrZWRUZXh0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4 dC5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVkTWFya2VkVGV4dDo6U3R5bGVkTWFya2VkVGV4 dCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWRNYXJrZWRUZXh0OjpzdHlsZSk6CisgICAgICAg ICogcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRC b3hQYWludGVyOjpwYWludEJhY2tncm91bmQpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEJveFBh aW50ZXI6OnBhaW50Rm9yZWdyb3VuZEFuZERlY29yYXRpb25zKToKKwogMjAyMi0wNS0xMiAgQWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgVGV4dEJveFBhaW50ZXI6OnBh aW50QmFja2dyb3VuZCBzaG91bGQgYmFpbCBvdXQgZWFybHkgd2hlbiBub3RoaW5nIHRvIHBhaW50 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5jcHAKaW5kZXgg NGUzY2RjNzRjYTUzYWQwNjNlMDk0YjIzODEwYzEyZWUyZWFmMjhkOC4uNGZmZTY3MjE2NTQzM2Uw MWRjZmVmODIwYTk4OWE5NGE0NDY4MjFmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1N0eWxlZE1hcmtlZFRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TdHlsZWRNYXJrZWRUZXh0LmNwcApAQCAtMTEwLDcgKzExMCw3IEBAIHN0YXRpYyBTdHlsZWRN YXJrZWRUZXh0IHJlc29sdmVTdHlsZUZvck1hcmtlZFRleHQoY29uc3QgTWFya2VkVGV4dCYgbWFy a2VkVGV4dCwKICAgICByZXR1cm4gc3R5bGVkTWFya2VkVGV4dDsKIH0KIAotc3RhdGljIFN0eWxl ZE1hcmtlZFRleHQ6OlN0eWxlIGNvbXB1dGVTdHlsZUZvclVubWFya2VkTWFya2VkVGV4dChjb25z dCBSZW5kZXJUZXh0JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSwgYm9v bCBpc0ZpcnN0TGluZSwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8pCitTdHlsZWRNYXJrZWRU ZXh0OjpTdHlsZSBTdHlsZWRNYXJrZWRUZXh0Ojpjb21wdXRlU3R5bGVGb3JVbm1hcmtlZE1hcmtl ZFRleHQoY29uc3QgUmVuZGVyVGV4dCYgcmVuZGVyZXIsIGNvbnN0IFJlbmRlclN0eWxlJiBsaW5l U3R5bGUsIGJvb2wgaXNGaXJzdExpbmUsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvKQogewog ICAgIFN0eWxlZE1hcmtlZFRleHQ6OlN0eWxlIHN0eWxlOwogICAgIHN0eWxlLnRleHREZWNvcmF0 aW9uU3R5bGVzID0gVGV4dERlY29yYXRpb25QYWludGVyOjpzdHlsZXNGb3JSZW5kZXJlcihyZW5k ZXJlciwgbGluZVN0eWxlLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCksIGlzRmlyc3RMaW5lKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TdHlsZWRNYXJrZWRUZXh0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5oCmluZGV4IDI0ZTZj MjdiNjM1MTI4YWMzYmNmMjhjNzkxZGRiNzk4MzRkYmY3ODcuLjJiZjNiNjBmODcxOGU2MWY4YTdm OTE4NjI1MzQ1ZjdjMDZkZTQwNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TdHlsZWRNYXJrZWRUZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1N0eWxl ZE1hcmtlZFRleHQuaApAQCAtMzYsMTEgKzM2LDYgQEAgY2xhc3MgUmVuZGVyVGV4dDsKIGNsYXNz IFJlbmRlcmVkRG9jdW1lbnRNYXJrZXI7CiAKIHN0cnVjdCBTdHlsZWRNYXJrZWRUZXh0IDogTWFy a2VkVGV4dCB7Ci0gICAgU3R5bGVkTWFya2VkVGV4dChjb25zdCBNYXJrZWRUZXh0JiBtYXJrZXIp Ci0gICAgICAgIDogTWFya2VkVGV4dCB7IG1hcmtlciB9Ci0gICAgewotICAgIH0KLQogICAgIHN0 cnVjdCBTdHlsZSB7CiAgICAgICAgIENvbG9yIGJhY2tncm91bmRDb2xvcjsKICAgICAgICAgVGV4 dFBhaW50U3R5bGUgdGV4dFN0eWxlczsKQEAgLTQ5LDEyICs0NCwyNCBAQCBzdHJ1Y3QgU3R5bGVk TWFya2VkVGV4dCA6IE1hcmtlZFRleHQgewogICAgICAgICBmbG9hdCBhbHBoYSB7IDEgfTsKICAg ICB9OwogCisgICAgU3R5bGVkTWFya2VkVGV4dChjb25zdCBNYXJrZWRUZXh0JiBtYXJrZXIpCisg ICAgICAgIDogTWFya2VkVGV4dCB7IG1hcmtlciB9CisgICAgeworICAgIH0KKworICAgIFN0eWxl ZE1hcmtlZFRleHQoY29uc3QgTWFya2VkVGV4dCYgbWFya2VyLCBTdHlsZSBzdHlsZSkKKyAgICAg ICAgOiBNYXJrZWRUZXh0IHsgbWFya2VyIH0KKyAgICAgICAgLCBzdHlsZShzdHlsZSkKKyAgICB7 CisgICAgfQorCiAgICAgU3R5bGUgc3R5bGU7CiAKICAgICBzdGF0aWMgVmVjdG9yPFN0eWxlZE1h cmtlZFRleHQ+IHN1YmRpdmlkZUFuZFJlc29sdmUoY29uc3QgVmVjdG9yPE1hcmtlZFRleHQ+Jiwg Y29uc3QgUmVuZGVyVGV4dCYsIGJvb2wgaXNGaXJzdExpbmUsIGNvbnN0IFBhaW50SW5mbyYpOwog ICAgIHN0YXRpYyBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4gY29hbGVzY2VBZGphY2VudFdpdGhF cXVhbEJhY2tncm91bmQoY29uc3QgVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+Jik7CiAgICAgc3Rh dGljIFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiBjb2FsZXNjZUFkamFjZW50V2l0aEVxdWFsRm9y ZWdyb3VuZChjb25zdCBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4mKTsKICAgICBzdGF0aWMgVmVj dG9yPFN0eWxlZE1hcmtlZFRleHQ+IGNvYWxlc2NlQWRqYWNlbnRXaXRoRXF1YWxEZWNvcmF0aW9u cyhjb25zdCBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4mKTsKKyAgICBzdGF0aWMgU3R5bGUgY29t cHV0ZVN0eWxlRm9yVW5tYXJrZWRNYXJrZWRUZXh0KGNvbnN0IFJlbmRlclRleHQmLCBjb25zdCBS ZW5kZXJTdHlsZSYsIGJvb2wgaXNGaXJzdExpbmUsIGNvbnN0IFBhaW50SW5mbyYpOwogfTsKIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAKaW5kZXggNGZm ZDY2NjJkOWM4ZjAwNmYzMTJhODBiYTE3NWEwY2E2MmMzMjdhYy4uNTI3NzA5MDUzMjg1Y2IyZWVl ZjI1NTAyOTkxNzI5Y2Y4Y2FiMzY5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1RleHRCb3hQYWludGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4 dEJveFBhaW50ZXIuY3BwCkBAIC0xNzEsNyArMTcxLDI3IEBAIHZvaWQgVGV4dEJveFBhaW50ZXI6 OnBhaW50QmFja2dyb3VuZCgpCiAKIHZvaWQgVGV4dEJveFBhaW50ZXI6OnBhaW50Rm9yZWdyb3Vu ZEFuZERlY29yYXRpb25zKCkKIHsKLSAgICBib29sIHNob3VsZFBhaW50U2VsZWN0aW9uRm9yZWdy b3VuZCA9IG1faGF2ZVNlbGVjdGlvbiAmJiAhbV91c2VDdXN0b21VbmRlcmxpbmVzOworICAgIGF1 dG8gc2hvdWxkUGFpbnRTZWxlY3Rpb25Gb3JlZ3JvdW5kID0gbV9oYXZlU2VsZWN0aW9uICYmICFt X3VzZUN1c3RvbVVuZGVybGluZXM7CisgICAgYXV0byBoYXNUZXh0RGVjb3JhdGlvbiA9ICFtX3N0 eWxlLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCkuaXNFbXB0eSgpOworICAgIGF1dG8gaGFzSGln aGxpZ2h0RGVjb3JhdGlvbiA9IG1fZG9jdW1lbnQuaGFzSGlnaGxpZ2h0KCkgJiYgIU1hcmtlZFRl eHQ6OmNvbGxlY3RGb3JIaWdobGlnaHRzKG1fcmVuZGVyZXIsIG1fc2VsZWN0YWJsZVJhbmdlLCBN YXJrZWRUZXh0OjpQYWludFBoYXNlOjpEZWNvcmF0aW9uKS5pc0VtcHR5KCk7CisgICAgYXV0byBo YXNEZWNvcmF0aW9uID0gaGFzVGV4dERlY29yYXRpb24gfHwgaGFzSGlnaGxpZ2h0RGVjb3JhdGlv bjsKKworICAgIGF1dG8gY29udGVudE1heU5lZWRTdHlsZWRNYXJrZWRUZXh0ID0gWyZdIHsKKyAg ICAgICAgaWYgKGhhc0RlY29yYXRpb24pCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgaWYgKHNob3VsZFBhaW50U2VsZWN0aW9uRm9yZWdyb3VuZCkKKyAgICAgICAgICAgIHJldHVy biB0cnVlOworICAgICAgICBpZiAobV9kb2N1bWVudC5tYXJrZXJzKCkuaGFzTWFya2VycygpKQor ICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9Owor ICAgIGlmICghY29udGVudE1heU5lZWRTdHlsZWRNYXJrZWRUZXh0KCkpIHsKKyAgICAgICAgYXV0 byYgbGluZVN0eWxlID0gbV9pc0ZpcnN0TGluZSA/IG1fcmVuZGVyZXIuZmlyc3RMaW5lU3R5bGUo KSA6IG1fcmVuZGVyZXIuc3R5bGUoKTsKKyAgICAgICAgcGFpbnRGb3JlZ3JvdW5kKHsgTWFya2Vk VGV4dCB7IG1fc2VsZWN0YWJsZVJhbmdlLmNsYW1wKHRleHRCb3goKS5zdGFydCgpKSwgbV9zZWxl Y3RhYmxlUmFuZ2UuY2xhbXAodGV4dEJveCgpLmVuZCgpKSwgTWFya2VkVGV4dDo6VW5tYXJrZWQg fQorICAgICAgICAgICAgLCBTdHlsZWRNYXJrZWRUZXh0Ojpjb21wdXRlU3R5bGVGb3JVbm1hcmtl ZE1hcmtlZFRleHQobV9yZW5kZXJlciwgbGluZVN0eWxlLCBtX2lzRmlyc3RMaW5lLCBtX3BhaW50 SW5mbykgfSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBWZWN0b3I8TWFya2VkVGV4 dD4gbWFya2VkVGV4dHM7CiAgICAgaWYgKG1fcGFpbnRJbmZvLnBoYXNlICE9IFBhaW50UGhhc2U6 OlNlbGVjdGlvbikgewogICAgICAgICAvLyBUaGUgbWFya2VkIHRleHRzIGZvciB0aGUgZ2FwcyBi ZXR3ZWVuIGRvY3VtZW50IG1hcmtlcnMgYW5kIHNlbGVjdGlvbiBhcmUgaW1wbGljaXRseSBjcmVh dGVkIGJ5IHN1YmRpdmlkaW5nIHRoZSBlbnRpcmUgbGluZS4KQEAgLTIwOCwxMCArMjI4LDcgQEAg dm9pZCBUZXh0Qm94UGFpbnRlcjo6cGFpbnRGb3JlZ3JvdW5kQW5kRGVjb3JhdGlvbnMoKQogICAg ICAgICB9KTsKICAgICB9CiAKLSAgICBhdXRvIHRleHREZWNvcmF0aW9ucyA9IG1fc3R5bGUudGV4 dERlY29yYXRpb25zSW5FZmZlY3QoKTsKLSAgICBib29sIGhpZ2hsaWdodERlY29yYXRpb25zID0g IU1hcmtlZFRleHQ6OmNvbGxlY3RGb3JIaWdobGlnaHRzKG1fcmVuZGVyZXIsIG1fc2VsZWN0YWJs ZVJhbmdlLCBNYXJrZWRUZXh0OjpQYWludFBoYXNlOjpEZWNvcmF0aW9uKS5pc0VtcHR5KCk7Ci0g ICAgYm9vbCBsaW5lRGVjb3JhdGlvbnMgPSAhdGV4dERlY29yYXRpb25zLmlzRW1wdHkoKTsKLSAg ICBpZiAoKGxpbmVEZWNvcmF0aW9ucyB8fCBoaWdobGlnaHREZWNvcmF0aW9ucykgJiYgbV9wYWlu dEluZm8ucGhhc2UgIT0gUGFpbnRQaGFzZTo6U2VsZWN0aW9uKSB7CisgICAgaWYgKGhhc0RlY29y YXRpb24gJiYgbV9wYWludEluZm8ucGhhc2UgIT0gUGFpbnRQaGFzZTo6U2VsZWN0aW9uKSB7CiAg ICAgICAgIFRleHRSdW4gdGV4dFJ1biA9IHRleHRCb3goKS5jcmVhdGVUZXh0UnVuKCk7CiAgICAg ICAgIHVuc2lnbmVkIGxlbmd0aCA9IG1fc2VsZWN0YWJsZVJhbmdlLnRydW5jYXRpb24udmFsdWVf b3IodGV4dFJ1bi5sZW5ndGgoKSk7CiAgICAgICAgIHVuc2lnbmVkIHNlbGVjdGlvblN0YXJ0ID0g MDsK 459247 2022-05-12 13:38:30 -0700 2022-05-12 15:30:12 -0700 Patch bug-240319-20220512133830.patch text/plain 6339 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjczNjE3NjVmM2MzNDJl Y2JjYzUxOGU3Nzk1ODU1MjVjZjM4ZjZiNi4uODljMjgxMDNjYTNkNzM5MjdiNDkwNTZiOWEwZjI3 NDA5YTJhYTc4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTA1LTEyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0Qm94UGFpbnRlcjo6cGFp bnRGb3JlZ3JvdW5kOiBwYWludGluZyB0ZXh0IHdpdGggbm8gbWFya2luZy9kZWNvcmF0aW9uIHNo b3VsZCBiZSBzaW1wbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI0MDMxOQorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAg ICAgICBMZXQncyBoYXZlIGEgZmFzdCBjb2RlcGF0aCBmb3IgcmVndWxhciwgc2ltcGxlIHRleHQg cGFpbnRpbmcuCisKKyAgICAgICAgKiByZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdHlsZWRNYXJrZWRUZXh0Ojpjb21wdXRlU3R5bGVGb3JVbm1hcmtl ZE1hcmtlZFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZVN0eWxlRm9yVW5tYXJrZWRN YXJrZWRUZXh0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4 dC5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVkTWFya2VkVGV4dDo6U3R5bGVkTWFya2VkVGV4 dCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWRNYXJrZWRUZXh0OjpzdHlsZSk6CisgICAgICAg ICogcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRC b3hQYWludGVyOjpwYWludEJhY2tncm91bmQpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEJveFBh aW50ZXI6OnBhaW50Rm9yZWdyb3VuZEFuZERlY29yYXRpb25zKToKKwogMjAyMi0wNS0xMiAgQWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgVGV4dEJveFBhaW50ZXI6OnBh aW50QmFja2dyb3VuZCBzaG91bGQgYmFpbCBvdXQgZWFybHkgd2hlbiBub3RoaW5nIHRvIHBhaW50 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5jcHAKaW5kZXgg NGUzY2RjNzRjYTUzYWQwNjNlMDk0YjIzODEwYzEyZWUyZWFmMjhkOC4uNGZmZTY3MjE2NTQzM2Uw MWRjZmVmODIwYTk4OWE5NGE0NDY4MjFmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1N0eWxlZE1hcmtlZFRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TdHlsZWRNYXJrZWRUZXh0LmNwcApAQCAtMTEwLDcgKzExMCw3IEBAIHN0YXRpYyBTdHlsZWRN YXJrZWRUZXh0IHJlc29sdmVTdHlsZUZvck1hcmtlZFRleHQoY29uc3QgTWFya2VkVGV4dCYgbWFy a2VkVGV4dCwKICAgICByZXR1cm4gc3R5bGVkTWFya2VkVGV4dDsKIH0KIAotc3RhdGljIFN0eWxl ZE1hcmtlZFRleHQ6OlN0eWxlIGNvbXB1dGVTdHlsZUZvclVubWFya2VkTWFya2VkVGV4dChjb25z dCBSZW5kZXJUZXh0JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSwgYm9v bCBpc0ZpcnN0TGluZSwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8pCitTdHlsZWRNYXJrZWRU ZXh0OjpTdHlsZSBTdHlsZWRNYXJrZWRUZXh0Ojpjb21wdXRlU3R5bGVGb3JVbm1hcmtlZE1hcmtl ZFRleHQoY29uc3QgUmVuZGVyVGV4dCYgcmVuZGVyZXIsIGNvbnN0IFJlbmRlclN0eWxlJiBsaW5l U3R5bGUsIGJvb2wgaXNGaXJzdExpbmUsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvKQogewog ICAgIFN0eWxlZE1hcmtlZFRleHQ6OlN0eWxlIHN0eWxlOwogICAgIHN0eWxlLnRleHREZWNvcmF0 aW9uU3R5bGVzID0gVGV4dERlY29yYXRpb25QYWludGVyOjpzdHlsZXNGb3JSZW5kZXJlcihyZW5k ZXJlciwgbGluZVN0eWxlLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCksIGlzRmlyc3RMaW5lKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TdHlsZWRNYXJrZWRUZXh0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5oCmluZGV4IDI0ZTZj MjdiNjM1MTI4YWMzYmNmMjhjNzkxZGRiNzk4MzRkYmY3ODcuLjJiZjNiNjBmODcxOGU2MWY4YTdm OTE4NjI1MzQ1ZjdjMDZkZTQwNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TdHlsZWRNYXJrZWRUZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1N0eWxl ZE1hcmtlZFRleHQuaApAQCAtMzYsMTEgKzM2LDYgQEAgY2xhc3MgUmVuZGVyVGV4dDsKIGNsYXNz IFJlbmRlcmVkRG9jdW1lbnRNYXJrZXI7CiAKIHN0cnVjdCBTdHlsZWRNYXJrZWRUZXh0IDogTWFy a2VkVGV4dCB7Ci0gICAgU3R5bGVkTWFya2VkVGV4dChjb25zdCBNYXJrZWRUZXh0JiBtYXJrZXIp Ci0gICAgICAgIDogTWFya2VkVGV4dCB7IG1hcmtlciB9Ci0gICAgewotICAgIH0KLQogICAgIHN0 cnVjdCBTdHlsZSB7CiAgICAgICAgIENvbG9yIGJhY2tncm91bmRDb2xvcjsKICAgICAgICAgVGV4 dFBhaW50U3R5bGUgdGV4dFN0eWxlczsKQEAgLTQ5LDEyICs0NCwyNCBAQCBzdHJ1Y3QgU3R5bGVk TWFya2VkVGV4dCA6IE1hcmtlZFRleHQgewogICAgICAgICBmbG9hdCBhbHBoYSB7IDEgfTsKICAg ICB9OwogCisgICAgU3R5bGVkTWFya2VkVGV4dChjb25zdCBNYXJrZWRUZXh0JiBtYXJrZXIpCisg ICAgICAgIDogTWFya2VkVGV4dCB7IG1hcmtlciB9CisgICAgeworICAgIH0KKworICAgIFN0eWxl ZE1hcmtlZFRleHQoY29uc3QgTWFya2VkVGV4dCYgbWFya2VyLCBTdHlsZSBzdHlsZSkKKyAgICAg ICAgOiBNYXJrZWRUZXh0IHsgbWFya2VyIH0KKyAgICAgICAgLCBzdHlsZShzdHlsZSkKKyAgICB7 CisgICAgfQorCiAgICAgU3R5bGUgc3R5bGU7CiAKICAgICBzdGF0aWMgVmVjdG9yPFN0eWxlZE1h cmtlZFRleHQ+IHN1YmRpdmlkZUFuZFJlc29sdmUoY29uc3QgVmVjdG9yPE1hcmtlZFRleHQ+Jiwg Y29uc3QgUmVuZGVyVGV4dCYsIGJvb2wgaXNGaXJzdExpbmUsIGNvbnN0IFBhaW50SW5mbyYpOwog ICAgIHN0YXRpYyBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4gY29hbGVzY2VBZGphY2VudFdpdGhF cXVhbEJhY2tncm91bmQoY29uc3QgVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+Jik7CiAgICAgc3Rh dGljIFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiBjb2FsZXNjZUFkamFjZW50V2l0aEVxdWFsRm9y ZWdyb3VuZChjb25zdCBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4mKTsKICAgICBzdGF0aWMgVmVj dG9yPFN0eWxlZE1hcmtlZFRleHQ+IGNvYWxlc2NlQWRqYWNlbnRXaXRoRXF1YWxEZWNvcmF0aW9u cyhjb25zdCBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4mKTsKKyAgICBzdGF0aWMgU3R5bGUgY29t cHV0ZVN0eWxlRm9yVW5tYXJrZWRNYXJrZWRUZXh0KGNvbnN0IFJlbmRlclRleHQmLCBjb25zdCBS ZW5kZXJTdHlsZSYsIGJvb2wgaXNGaXJzdExpbmUsIGNvbnN0IFBhaW50SW5mbyYpOwogfTsKIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAKaW5kZXggNGZm ZDY2NjJkOWM4ZjAwNmYzMTJhODBiYTE3NWEwY2E2MmMzMjdhYy4uNDdmMTMwYjhmNGE2NzIzNTBi MGRhN2JmZGZiNGQ1MGI5NzVjZDhiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1RleHRCb3hQYWludGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4 dEJveFBhaW50ZXIuY3BwCkBAIC0xNzEsNyArMTcxLDI5IEBAIHZvaWQgVGV4dEJveFBhaW50ZXI6 OnBhaW50QmFja2dyb3VuZCgpCiAKIHZvaWQgVGV4dEJveFBhaW50ZXI6OnBhaW50Rm9yZWdyb3Vu ZEFuZERlY29yYXRpb25zKCkKIHsKLSAgICBib29sIHNob3VsZFBhaW50U2VsZWN0aW9uRm9yZWdy b3VuZCA9IG1faGF2ZVNlbGVjdGlvbiAmJiAhbV91c2VDdXN0b21VbmRlcmxpbmVzOworICAgIGF1 dG8gc2hvdWxkUGFpbnRTZWxlY3Rpb25Gb3JlZ3JvdW5kID0gbV9oYXZlU2VsZWN0aW9uICYmICFt X3VzZUN1c3RvbVVuZGVybGluZXM7CisgICAgYXV0byBoYXNUZXh0RGVjb3JhdGlvbiA9ICFtX3N0 eWxlLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCkuaXNFbXB0eSgpOworICAgIGF1dG8gaGFzSGln aGxpZ2h0RGVjb3JhdGlvbiA9IG1fZG9jdW1lbnQuaGFzSGlnaGxpZ2h0KCkgJiYgIU1hcmtlZFRl eHQ6OmNvbGxlY3RGb3JIaWdobGlnaHRzKG1fcmVuZGVyZXIsIG1fc2VsZWN0YWJsZVJhbmdlLCBN YXJrZWRUZXh0OjpQYWludFBoYXNlOjpEZWNvcmF0aW9uKS5pc0VtcHR5KCk7CisgICAgYXV0byBo YXNEZWNvcmF0aW9uID0gaGFzVGV4dERlY29yYXRpb24gfHwgaGFzSGlnaGxpZ2h0RGVjb3JhdGlv bjsKKworICAgIGF1dG8gY29udGVudE1heU5lZWRTdHlsZWRNYXJrZWRUZXh0ID0gWyZdIHsKKyAg ICAgICAgaWYgKGhhc0RlY29yYXRpb24pCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgaWYgKHNob3VsZFBhaW50U2VsZWN0aW9uRm9yZWdyb3VuZCkKKyAgICAgICAgICAgIHJldHVy biB0cnVlOworICAgICAgICBpZiAobV9kb2N1bWVudC5tYXJrZXJzKCkuaGFzTWFya2VycygpKQor ICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmIChtX2RvY3VtZW50Lmhhc0hpZ2hs aWdodCgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICB9OworICAgIGlmICghY29udGVudE1heU5lZWRTdHlsZWRNYXJrZWRUZXh0KCkpIHsKKyAg ICAgICAgYXV0byYgbGluZVN0eWxlID0gbV9pc0ZpcnN0TGluZSA/IG1fcmVuZGVyZXIuZmlyc3RM aW5lU3R5bGUoKSA6IG1fcmVuZGVyZXIuc3R5bGUoKTsKKyAgICAgICAgcGFpbnRGb3JlZ3JvdW5k KHsgTWFya2VkVGV4dCB7IG1fc2VsZWN0YWJsZVJhbmdlLmNsYW1wKHRleHRCb3goKS5zdGFydCgp KSwgbV9zZWxlY3RhYmxlUmFuZ2UuY2xhbXAodGV4dEJveCgpLmVuZCgpKSwgTWFya2VkVGV4dDo6 VW5tYXJrZWQgfQorICAgICAgICAgICAgLCBTdHlsZWRNYXJrZWRUZXh0Ojpjb21wdXRlU3R5bGVG b3JVbm1hcmtlZE1hcmtlZFRleHQobV9yZW5kZXJlciwgbGluZVN0eWxlLCBtX2lzRmlyc3RMaW5l LCBtX3BhaW50SW5mbykgfSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBWZWN0b3I8 TWFya2VkVGV4dD4gbWFya2VkVGV4dHM7CiAgICAgaWYgKG1fcGFpbnRJbmZvLnBoYXNlICE9IFBh aW50UGhhc2U6OlNlbGVjdGlvbikgewogICAgICAgICAvLyBUaGUgbWFya2VkIHRleHRzIGZvciB0 aGUgZ2FwcyBiZXR3ZWVuIGRvY3VtZW50IG1hcmtlcnMgYW5kIHNlbGVjdGlvbiBhcmUgaW1wbGlj aXRseSBjcmVhdGVkIGJ5IHN1YmRpdmlkaW5nIHRoZSBlbnRpcmUgbGluZS4KQEAgLTIwOCwxMCAr MjMwLDcgQEAgdm9pZCBUZXh0Qm94UGFpbnRlcjo6cGFpbnRGb3JlZ3JvdW5kQW5kRGVjb3JhdGlv bnMoKQogICAgICAgICB9KTsKICAgICB9CiAKLSAgICBhdXRvIHRleHREZWNvcmF0aW9ucyA9IG1f c3R5bGUudGV4dERlY29yYXRpb25zSW5FZmZlY3QoKTsKLSAgICBib29sIGhpZ2hsaWdodERlY29y YXRpb25zID0gIU1hcmtlZFRleHQ6OmNvbGxlY3RGb3JIaWdobGlnaHRzKG1fcmVuZGVyZXIsIG1f c2VsZWN0YWJsZVJhbmdlLCBNYXJrZWRUZXh0OjpQYWludFBoYXNlOjpEZWNvcmF0aW9uKS5pc0Vt cHR5KCk7Ci0gICAgYm9vbCBsaW5lRGVjb3JhdGlvbnMgPSAhdGV4dERlY29yYXRpb25zLmlzRW1w dHkoKTsKLSAgICBpZiAoKGxpbmVEZWNvcmF0aW9ucyB8fCBoaWdobGlnaHREZWNvcmF0aW9ucykg JiYgbV9wYWludEluZm8ucGhhc2UgIT0gUGFpbnRQaGFzZTo6U2VsZWN0aW9uKSB7CisgICAgaWYg KGhhc0RlY29yYXRpb24gJiYgbV9wYWludEluZm8ucGhhc2UgIT0gUGFpbnRQaGFzZTo6U2VsZWN0 aW9uKSB7CiAgICAgICAgIFRleHRSdW4gdGV4dFJ1biA9IHRleHRCb3goKS5jcmVhdGVUZXh0UnVu KCk7CiAgICAgICAgIHVuc2lnbmVkIGxlbmd0aCA9IG1fc2VsZWN0YWJsZVJhbmdlLnRydW5jYXRp b24udmFsdWVfb3IodGV4dFJ1bi5sZW5ndGgoKSk7CiAgICAgICAgIHVuc2lnbmVkIHNlbGVjdGlv blN0YXJ0ID0gMDsK 459253 2022-05-12 15:30:14 -0700 2022-05-12 17:32:44 -0700 Patch bug-240319-20220512153013.patch text/plain 6338 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjczNjE3NjVmM2MzNDJl Y2JjYzUxOGU3Nzk1ODU1MjVjZjM4ZjZiNi4uODljMjgxMDNjYTNkNzM5MjdiNDkwNTZiOWEwZjI3 NDA5YTJhYTc4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTA1LTEyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0Qm94UGFpbnRlcjo6cGFp bnRGb3JlZ3JvdW5kOiBwYWludGluZyB0ZXh0IHdpdGggbm8gbWFya2luZy9kZWNvcmF0aW9uIHNo b3VsZCBiZSBzaW1wbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI0MDMxOQorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAg ICAgICBMZXQncyBoYXZlIGEgZmFzdCBjb2RlcGF0aCBmb3IgcmVndWxhciwgc2ltcGxlIHRleHQg cGFpbnRpbmcuCisKKyAgICAgICAgKiByZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdHlsZWRNYXJrZWRUZXh0Ojpjb21wdXRlU3R5bGVGb3JVbm1hcmtl ZE1hcmtlZFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZVN0eWxlRm9yVW5tYXJrZWRN YXJrZWRUZXh0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4 dC5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVkTWFya2VkVGV4dDo6U3R5bGVkTWFya2VkVGV4 dCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWRNYXJrZWRUZXh0OjpzdHlsZSk6CisgICAgICAg ICogcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRC b3hQYWludGVyOjpwYWludEJhY2tncm91bmQpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEJveFBh aW50ZXI6OnBhaW50Rm9yZWdyb3VuZEFuZERlY29yYXRpb25zKToKKwogMjAyMi0wNS0xMiAgQWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgVGV4dEJveFBhaW50ZXI6OnBh aW50QmFja2dyb3VuZCBzaG91bGQgYmFpbCBvdXQgZWFybHkgd2hlbiBub3RoaW5nIHRvIHBhaW50 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5jcHAKaW5kZXgg NGUzY2RjNzRjYTUzYWQwNjNlMDk0YjIzODEwYzEyZWUyZWFmMjhkOC4uNGZmZTY3MjE2NTQzM2Uw MWRjZmVmODIwYTk4OWE5NGE0NDY4MjFmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1N0eWxlZE1hcmtlZFRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TdHlsZWRNYXJrZWRUZXh0LmNwcApAQCAtMTEwLDcgKzExMCw3IEBAIHN0YXRpYyBTdHlsZWRN YXJrZWRUZXh0IHJlc29sdmVTdHlsZUZvck1hcmtlZFRleHQoY29uc3QgTWFya2VkVGV4dCYgbWFy a2VkVGV4dCwKICAgICByZXR1cm4gc3R5bGVkTWFya2VkVGV4dDsKIH0KIAotc3RhdGljIFN0eWxl ZE1hcmtlZFRleHQ6OlN0eWxlIGNvbXB1dGVTdHlsZUZvclVubWFya2VkTWFya2VkVGV4dChjb25z dCBSZW5kZXJUZXh0JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSwgYm9v bCBpc0ZpcnN0TGluZSwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8pCitTdHlsZWRNYXJrZWRU ZXh0OjpTdHlsZSBTdHlsZWRNYXJrZWRUZXh0Ojpjb21wdXRlU3R5bGVGb3JVbm1hcmtlZE1hcmtl ZFRleHQoY29uc3QgUmVuZGVyVGV4dCYgcmVuZGVyZXIsIGNvbnN0IFJlbmRlclN0eWxlJiBsaW5l U3R5bGUsIGJvb2wgaXNGaXJzdExpbmUsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvKQogewog ICAgIFN0eWxlZE1hcmtlZFRleHQ6OlN0eWxlIHN0eWxlOwogICAgIHN0eWxlLnRleHREZWNvcmF0 aW9uU3R5bGVzID0gVGV4dERlY29yYXRpb25QYWludGVyOjpzdHlsZXNGb3JSZW5kZXJlcihyZW5k ZXJlciwgbGluZVN0eWxlLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCksIGlzRmlyc3RMaW5lKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TdHlsZWRNYXJrZWRUZXh0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU3R5bGVkTWFya2VkVGV4dC5oCmluZGV4IDI0ZTZj MjdiNjM1MTI4YWMzYmNmMjhjNzkxZGRiNzk4MzRkYmY3ODcuLjJiZjNiNjBmODcxOGU2MWY4YTdm OTE4NjI1MzQ1ZjdjMDZkZTQwNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TdHlsZWRNYXJrZWRUZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1N0eWxl ZE1hcmtlZFRleHQuaApAQCAtMzYsMTEgKzM2LDYgQEAgY2xhc3MgUmVuZGVyVGV4dDsKIGNsYXNz IFJlbmRlcmVkRG9jdW1lbnRNYXJrZXI7CiAKIHN0cnVjdCBTdHlsZWRNYXJrZWRUZXh0IDogTWFy a2VkVGV4dCB7Ci0gICAgU3R5bGVkTWFya2VkVGV4dChjb25zdCBNYXJrZWRUZXh0JiBtYXJrZXIp Ci0gICAgICAgIDogTWFya2VkVGV4dCB7IG1hcmtlciB9Ci0gICAgewotICAgIH0KLQogICAgIHN0 cnVjdCBTdHlsZSB7CiAgICAgICAgIENvbG9yIGJhY2tncm91bmRDb2xvcjsKICAgICAgICAgVGV4 dFBhaW50U3R5bGUgdGV4dFN0eWxlczsKQEAgLTQ5LDEyICs0NCwyNCBAQCBzdHJ1Y3QgU3R5bGVk TWFya2VkVGV4dCA6IE1hcmtlZFRleHQgewogICAgICAgICBmbG9hdCBhbHBoYSB7IDEgfTsKICAg ICB9OwogCisgICAgU3R5bGVkTWFya2VkVGV4dChjb25zdCBNYXJrZWRUZXh0JiBtYXJrZXIpCisg ICAgICAgIDogTWFya2VkVGV4dCB7IG1hcmtlciB9CisgICAgeworICAgIH0KKworICAgIFN0eWxl ZE1hcmtlZFRleHQoY29uc3QgTWFya2VkVGV4dCYgbWFya2VyLCBTdHlsZSBzdHlsZSkKKyAgICAg ICAgOiBNYXJrZWRUZXh0IHsgbWFya2VyIH0KKyAgICAgICAgLCBzdHlsZShzdHlsZSkKKyAgICB7 CisgICAgfQorCiAgICAgU3R5bGUgc3R5bGU7CiAKICAgICBzdGF0aWMgVmVjdG9yPFN0eWxlZE1h cmtlZFRleHQ+IHN1YmRpdmlkZUFuZFJlc29sdmUoY29uc3QgVmVjdG9yPE1hcmtlZFRleHQ+Jiwg Y29uc3QgUmVuZGVyVGV4dCYsIGJvb2wgaXNGaXJzdExpbmUsIGNvbnN0IFBhaW50SW5mbyYpOwog ICAgIHN0YXRpYyBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4gY29hbGVzY2VBZGphY2VudFdpdGhF cXVhbEJhY2tncm91bmQoY29uc3QgVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+Jik7CiAgICAgc3Rh dGljIFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiBjb2FsZXNjZUFkamFjZW50V2l0aEVxdWFsRm9y ZWdyb3VuZChjb25zdCBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4mKTsKICAgICBzdGF0aWMgVmVj dG9yPFN0eWxlZE1hcmtlZFRleHQ+IGNvYWxlc2NlQWRqYWNlbnRXaXRoRXF1YWxEZWNvcmF0aW9u cyhjb25zdCBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4mKTsKKyAgICBzdGF0aWMgU3R5bGUgY29t cHV0ZVN0eWxlRm9yVW5tYXJrZWRNYXJrZWRUZXh0KGNvbnN0IFJlbmRlclRleHQmLCBjb25zdCBS ZW5kZXJTdHlsZSYsIGJvb2wgaXNGaXJzdExpbmUsIGNvbnN0IFBhaW50SW5mbyYpOwogfTsKIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAKaW5kZXggNGZm ZDY2NjJkOWM4ZjAwNmYzMTJhODBiYTE3NWEwY2E2MmMzMjdhYy4uOTViNTI2N2M5ZWJlNWVmNDdj ZDQzZTBiZWE5NGQzYjQ4ZDQxYWNmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1RleHRCb3hQYWludGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4 dEJveFBhaW50ZXIuY3BwCkBAIC0xNzEsNyArMTcxLDI5IEBAIHZvaWQgVGV4dEJveFBhaW50ZXI6 OnBhaW50QmFja2dyb3VuZCgpCiAKIHZvaWQgVGV4dEJveFBhaW50ZXI6OnBhaW50Rm9yZWdyb3Vu ZEFuZERlY29yYXRpb25zKCkKIHsKLSAgICBib29sIHNob3VsZFBhaW50U2VsZWN0aW9uRm9yZWdy b3VuZCA9IG1faGF2ZVNlbGVjdGlvbiAmJiAhbV91c2VDdXN0b21VbmRlcmxpbmVzOworICAgIGF1 dG8gc2hvdWxkUGFpbnRTZWxlY3Rpb25Gb3JlZ3JvdW5kID0gbV9oYXZlU2VsZWN0aW9uICYmICFt X3VzZUN1c3RvbVVuZGVybGluZXM7CisgICAgYXV0byBoYXNUZXh0RGVjb3JhdGlvbiA9ICFtX3N0 eWxlLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCkuaXNFbXB0eSgpOworICAgIGF1dG8gaGFzSGln aGxpZ2h0RGVjb3JhdGlvbiA9IG1fZG9jdW1lbnQuaGFzSGlnaGxpZ2h0KCkgJiYgIU1hcmtlZFRl eHQ6OmNvbGxlY3RGb3JIaWdobGlnaHRzKG1fcmVuZGVyZXIsIG1fc2VsZWN0YWJsZVJhbmdlLCBN YXJrZWRUZXh0OjpQYWludFBoYXNlOjpEZWNvcmF0aW9uKS5pc0VtcHR5KCk7CisgICAgYXV0byBo YXNEZWNvcmF0aW9uID0gaGFzVGV4dERlY29yYXRpb24gfHwgaGFzSGlnaGxpZ2h0RGVjb3JhdGlv bjsKKworICAgIGF1dG8gY29udGVudE1heU5lZWRTdHlsZWRNYXJrZWRUZXh0ID0gWyZdIHsKKyAg ICAgICAgaWYgKGhhc0RlY29yYXRpb24pCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgaWYgKHNob3VsZFBhaW50U2VsZWN0aW9uRm9yZWdyb3VuZCkKKyAgICAgICAgICAgIHJldHVy biB0cnVlOworICAgICAgICBpZiAobV9kb2N1bWVudC5tYXJrZXJzKCkuaGFzTWFya2VycygpKQor ICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmIChtX2RvY3VtZW50Lmhhc0hpZ2hs aWdodCgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICB9OworICAgIGlmICghY29udGVudE1heU5lZWRTdHlsZWRNYXJrZWRUZXh0KCkpIHsKKyAg ICAgICAgYXV0byYgbGluZVN0eWxlID0gbV9pc0ZpcnN0TGluZSA/IG1fcmVuZGVyZXIuZmlyc3RM aW5lU3R5bGUoKSA6IG1fcmVuZGVyZXIuc3R5bGUoKTsKKyAgICAgICAgcGFpbnRGb3JlZ3JvdW5k KHsgTWFya2VkVGV4dCB7IG1fc2VsZWN0YWJsZVJhbmdlLmNsYW1wKHRleHRCb3goKS5zdGFydCgp KSwgbV9zZWxlY3RhYmxlUmFuZ2UuY2xhbXAodGV4dEJveCgpLmVuZCgpKSwgTWFya2VkVGV4dDo6 VW5tYXJrZWQgfSwKKyAgICAgICAgICAgIFN0eWxlZE1hcmtlZFRleHQ6OmNvbXB1dGVTdHlsZUZv clVubWFya2VkTWFya2VkVGV4dChtX3JlbmRlcmVyLCBsaW5lU3R5bGUsIG1faXNGaXJzdExpbmUs IG1fcGFpbnRJbmZvKSB9KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIFZlY3RvcjxN YXJrZWRUZXh0PiBtYXJrZWRUZXh0czsKICAgICBpZiAobV9wYWludEluZm8ucGhhc2UgIT0gUGFp bnRQaGFzZTo6U2VsZWN0aW9uKSB7CiAgICAgICAgIC8vIFRoZSBtYXJrZWQgdGV4dHMgZm9yIHRo ZSBnYXBzIGJldHdlZW4gZG9jdW1lbnQgbWFya2VycyBhbmQgc2VsZWN0aW9uIGFyZSBpbXBsaWNp dGx5IGNyZWF0ZWQgYnkgc3ViZGl2aWRpbmcgdGhlIGVudGlyZSBsaW5lLgpAQCAtMjA4LDEwICsy MzAsNyBAQCB2b2lkIFRleHRCb3hQYWludGVyOjpwYWludEZvcmVncm91bmRBbmREZWNvcmF0aW9u cygpCiAgICAgICAgIH0pOwogICAgIH0KIAotICAgIGF1dG8gdGV4dERlY29yYXRpb25zID0gbV9z dHlsZS50ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCgpOwotICAgIGJvb2wgaGlnaGxpZ2h0RGVjb3Jh dGlvbnMgPSAhTWFya2VkVGV4dDo6Y29sbGVjdEZvckhpZ2hsaWdodHMobV9yZW5kZXJlciwgbV9z ZWxlY3RhYmxlUmFuZ2UsIE1hcmtlZFRleHQ6OlBhaW50UGhhc2U6OkRlY29yYXRpb24pLmlzRW1w dHkoKTsKLSAgICBib29sIGxpbmVEZWNvcmF0aW9ucyA9ICF0ZXh0RGVjb3JhdGlvbnMuaXNFbXB0 eSgpOwotICAgIGlmICgobGluZURlY29yYXRpb25zIHx8IGhpZ2hsaWdodERlY29yYXRpb25zKSAm JiBtX3BhaW50SW5mby5waGFzZSAhPSBQYWludFBoYXNlOjpTZWxlY3Rpb24pIHsKKyAgICBpZiAo aGFzRGVjb3JhdGlvbiAmJiBtX3BhaW50SW5mby5waGFzZSAhPSBQYWludFBoYXNlOjpTZWxlY3Rp b24pIHsKICAgICAgICAgVGV4dFJ1biB0ZXh0UnVuID0gdGV4dEJveCgpLmNyZWF0ZVRleHRSdW4o KTsKICAgICAgICAgdW5zaWduZWQgbGVuZ3RoID0gbV9zZWxlY3RhYmxlUmFuZ2UudHJ1bmNhdGlv bi52YWx1ZV9vcih0ZXh0UnVuLmxlbmd0aCgpKTsKICAgICAgICAgdW5zaWduZWQgc2VsZWN0aW9u U3RhcnQgPSAwOwo=