222564 2021-03-01 10:58:02 -0800 [LFC][IFC] Move simplified baseline alignment to a dedicated function 2021-03-01 21:01:17 -0800 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 1734492 0 zalan 2021-03-01 10:58:02 -0800 this is in preparation for support different types of inline level boxes. 1734493 1 421844 zalan 2021-03-01 10:59:38 -0800 Created attachment 421844 Patch 1734507 2 421848 zalan 2021-03-01 11:16:27 -0800 Created attachment 421848 Patch 1734739 3 421900 zalan 2021-03-01 20:26:09 -0800 Created attachment 421900 Patch 1734745 4 ews-feeder 2021-03-01 21:01:00 -0800 Committed r273723: <https://commits.webkit.org/r273723> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421900. 1734746 5 webkit-bug-importer 2021-03-01 21:01:17 -0800 <rdar://problem/74908784> 421844 2021-03-01 10:59:38 -0800 2021-03-01 11:16:25 -0800 Patch bug-222564-20210301105937.patch text/plain 5664 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDdlOTNmNzFiNzc0ZGM0 MjY4NDg1MzQ3YWViMDU4YTk1ODc1NTA2Zi4uOGZjZDc4NTYyODVhNDA3ZDczYmI2MDFkMDViMmFl NTg1MGNiOWVkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIHNp bXBsaWZpZWQgYmFzZWxpbmUgYWxpZ25tZW50IHRvIGEgZGVkaWNhdGVkIGZ1bmN0aW9uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI1NjQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHBy ZXBhcmF0aW9uIGZvciBzdXBwb3J0aW5nIG5vbi1hdG9taWMgaW5saW5lIGxldmVsIGJveGVzLgor CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVy OjpzaW1wbGlmaWVkQWxpZ25JbmxpbmVCb3hJZkFwcGxpY2FibGUgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hl cyk6CisKIDIwMjEtMDMtMDEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtJRkNdIE1vdmUgc2ltcGxpZmllZCB2ZXJ0aWNhbCBhbGlnbm1lbnQgY29tcHV0 YXRpb24gdG8gc3RydWN0IFNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBhOTA2YmFlNDIxZGE5 N2IyNjFkMjQ5YTI0M2IxZmZhODg5OTRmMjM0Li4xOTk3NWRkZTI1OWQ1NTdkNWM1MjEzNjk5Zjhj MWY2ODA5NjM4N2IyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcApAQCAtNDgsNiArNDgsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0VmVydGlj YWxHZW9tZXRyeUZvcklubGluZUJveChMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYpIGNvbnN0Owog ICAgIHZvaWQgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiwgY29uc3QgTGluZTo6 UnVuTGlzdCYpOwogICAgIHZvaWQgY29tcHV0ZUxpbmVCb3hIZWlnaHRBbmRBbGlnbklubGluZUxl dmVsQm94ZXNWZXJ0aWNhbGx5KExpbmVCb3gmKTsKKyAgICBib29sIHNpbXBsaWZpZWRBbGlnbklu bGluZUJveElmQXBwbGljYWJsZShMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYsIGNvbnN0IEJveEdl b21ldHJ5JiBpbmxpbmVMZXZlbEJveEdlb21ldHJ5LCBjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZl bEJveCYgcm9vdElubGluZUJveCkgY29uc3Q7CiAKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dCYgZm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUZvcm1h dHRpbmdDb250ZXh0OyB9CiAgICAgY29uc3QgQm94JiByb290Qm94KCkgY29uc3QgeyByZXR1cm4g Zm9ybWF0dGluZ0NvbnRleHQoKS5yb290KCk7IH0KQEAgLTIwMSw2ICsyMDIsMjcgQEAgdm9pZCBM aW5lQm94QnVpbGRlcjo6c2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChMaW5lQm94OjpJ bmxpbmVMZXZlbEJveCYgaW4KICAgICBpbmxpbmVMZXZlbEJveC5zZXRMYXlvdXRCb3VuZHMoTGlu ZUJveDo6SW5saW5lTGV2ZWxCb3g6OkxheW91dEJvdW5kcyB7IGZsb29yZihhc2NlbnQpLCBjZWls KGRlc2NlbnQpIH0pOwogfQogCitib29sIExpbmVCb3hCdWlsZGVyOjpzaW1wbGlmaWVkQWxpZ25J bmxpbmVCb3hJZkFwcGxpY2FibGUoTGluZUJveDo6SW5saW5lTGV2ZWxCb3gmIGlubGluZUxldmVs Qm94LCBjb25zdCBCb3hHZW9tZXRyeSYgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeSwgY29uc3QgTGlu ZUJveDo6SW5saW5lTGV2ZWxCb3gmIHJvb3RJbmxpbmVCb3gpIGNvbnN0Cit7CisgICAgQVNTRVJU KG1fdXNlU2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50KTsKKyAgICBpZiAoaW5saW5lTGV2ZWxC b3guaXNBdG9taWNJbmxpbmVMZXZlbEJveCgpKSB7CisgICAgICAgIC8vIEJhc2VsaW5lIGFsaWdu ZWQsIG5vbi1zdHJldGNoeSBkaXJlY3QgY2hpbGRyZW4gYXJlIGNvbnNpZGVyZWQgdG8gYmUgc2lt cGxlIGZvciBub3cuCisgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUxldmVsQm94Lmxh eW91dEJveCgpOworICAgICAgICBhdXRvIGlzQ29uc2lkZXJlZFNpbXBsZSA9ICZsYXlvdXRCb3gu cGFyZW50KCkgPT0gJnJvb3RCb3goKQorICAgICAgICAgICAgJiYgbGF5b3V0Qm94LnN0eWxlKCku dmVydGljYWxBbGlnbigpID09IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lCisgICAgICAgICAgICAm JiAhaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKQorICAgICAgICAgICAgJiYg IWlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQWZ0ZXIoKQorICAgICAgICAgICAgJiYgaW5s aW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5Cb3hIZWlnaHQoKSA8PSByb290SW5saW5lQm94LmJh c2VsaW5lKCk7CisgICAgICAgIGlmICghaXNDb25zaWRlcmVkU2ltcGxlKQorICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICAvLyBPbmx5IGJhc2VsaW5lIGFsaWdubWVudCBmb3Igbm93 LgorICAgICAgICBpbmxpbmVMZXZlbEJveC5zZXRMb2dpY2FsVG9wKHJvb3RJbmxpbmVCb3guYmFz ZWxpbmUoKSAtIGlubGluZUxldmVsQm94LmJhc2VsaW5lKCkpOworICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICB9CisgICAgQVNTRVJUX05PVF9JTVBMRU1FTlRFRF9ZRVQoKTsKKyAgICByZXR1cm4g ZmFsc2U7Cit9CisKIHN0cnVjdCBTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgewogICAgIFNp bXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudChjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYg cm9vdElubGluZUJveCkKICAgICAgICAgOiBtX3Jvb3RJbmxpbmVCb3gocm9vdElubGluZUJveCkK QEAgLTMxNywyNiArMzM5LDEyIEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGlu ZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuCiAgICAgICAgICAg ICBhdXRvIGF0b21pY0lubGluZUxldmVsQm94ID0gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNy ZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgbG9naWNhbExlZnQsIHsgaW5saW5l TGV2ZWxCb3hHZW9tZXRyeS5ib3JkZXJCb3hXaWR0aCgpLCBtYXJnaW5Cb3hIZWlnaHQgfSk7CiAg ICAgICAgICAgICBhdG9taWNJbmxpbmVMZXZlbEJveC0+c2V0QmFzZWxpbmUoYXNjZW50KTsKICAg ICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRMYXlvdXRCb3VuZHMoTGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OkxheW91dEJvdW5kcyB7IGFzY2VudCwgbWFyZ2luQm94SGVpZ2h0IC0g YXNjZW50IH0pOwotICAgICAgICAgICAgLy8gTGV0J3MgcHJlLWNvbXB1dGUgdGhlIGxvZ2ljYWwg dG9wIHNvIHRoYXQgd2UgY2FuIGF2b2lkIHJ1bm5pbmcgdGhlIGFsaWdubWVudCBvbiBzaW1wbGUg aW5saW5lIGJveGVzLgotICAgICAgICAgICAgYXV0byBhbGlnbklubGluZUJveElmRWxpZ2libGUg PSBbJl0gewotICAgICAgICAgICAgICAgIGlmICghbV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGln bm1lbnQpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgICAgICAvLyBC YXNlbGluZSBhbGlnbmVkLCBub24tc3RyZXRjaHkgZGlyZWN0IGNoaWxkcmVuIGFyZSBjb25zaWRl cmVkIHRvIGJlIHNpbXBsZSBmb3Igbm93LgotICAgICAgICAgICAgICAgIGF1dG8gaXNDb25zaWRl cmVkU2ltcGxlID0gJmxheW91dEJveC5wYXJlbnQoKSA9PSAmcm9vdEJveCgpCi0gICAgICAgICAg ICAgICAgICAgICYmIGxheW91dEJveC5zdHlsZSgpLnZlcnRpY2FsQWxpZ24oKSA9PSBWZXJ0aWNh bEFsaWduOjpCYXNlbGluZQotICAgICAgICAgICAgICAgICAgICAmJiAhaW5saW5lTGV2ZWxCb3hH ZW9tZXRyeS5tYXJnaW5CZWZvcmUoKQotICAgICAgICAgICAgICAgICAgICAmJiAhaW5saW5lTGV2 ZWxCb3hHZW9tZXRyeS5tYXJnaW5BZnRlcigpCi0gICAgICAgICAgICAgICAgICAgICYmIG1hcmdp bkJveEhlaWdodCA8PSByb290SW5saW5lQm94LmJhc2VsaW5lKCk7Ci0gICAgICAgICAgICAgICAg aWYgKCFpc0NvbnNpZGVyZWRTaW1wbGUpIHsKLSAgICAgICAgICAgICAgICAgICAgbV91c2VTaW1w bGlmaWVkVmVydGljYWxBbGlnbm1lbnQgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAvLyBPbmx5IGJhc2VsaW5l IGFsaWdubWVudCBmb3Igbm93LgotICAgICAgICAgICAgICAgIGF1dG8gbG9naWNhbFRvcCA9IHJv b3RJbmxpbmVCb3guYmFzZWxpbmUoKSAtIGFzY2VudDsKLSAgICAgICAgICAgICAgICBhdG9taWNJ bmxpbmVMZXZlbEJveC0+c2V0TG9naWNhbFRvcChsb2dpY2FsVG9wKTsKLSAgICAgICAgICAgICAg ICBzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQuYWRqdXN0KCphdG9taWNJbmxpbmVMZXZlbEJv eCk7Ci0gICAgICAgICAgICB9OwotICAgICAgICAgICAgYWxpZ25JbmxpbmVCb3hJZkVsaWdpYmxl KCk7CisgICAgICAgICAgICBpZiAobV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQpIHsK KyAgICAgICAgICAgICAgICAvLyBMZXQncyBwcmUtY29tcHV0ZSB0aGUgbG9naWNhbCB0b3Agc28g dGhhdCB3ZSBjYW4gYXZvaWQgcnVubmluZyB0aGUgYWxpZ25tZW50IG9uIHNpbXBsZSBpbmxpbmUg bGV2ZWwgYm94ZXMuCisgICAgICAgICAgICAgICAgbV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGln bm1lbnQgPSBzaW1wbGlmaWVkQWxpZ25JbmxpbmVCb3hJZkFwcGxpY2FibGUoKmF0b21pY0lubGlu ZUxldmVsQm94LCBpbmxpbmVMZXZlbEJveEdlb21ldHJ5LCByb290SW5saW5lQm94KTsKKyAgICAg ICAgICAgICAgICBpZiAobV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQpCisgICAgICAg ICAgICAgICAgICAgIHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudC5hZGp1c3QoKmF0b21pY0lu bGluZUxldmVsQm94KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5s aW5lTGV2ZWxCb3goV1RGTW92ZShhdG9taWNJbmxpbmVMZXZlbEJveCkpOwogICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIH0K 421848 2021-03-01 11:16:27 -0800 2021-03-01 20:26:07 -0800 Patch bug-222564-20210301111626.patch text/plain 6456 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDdlOTNmNzFiNzc0ZGM0 MjY4NDg1MzQ3YWViMDU4YTk1ODc1NTA2Zi4uOGZjZDc4NTYyODVhNDA3ZDczYmI2MDFkMDViMmFl NTg1MGNiOWVkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIHNp bXBsaWZpZWQgYmFzZWxpbmUgYWxpZ25tZW50IHRvIGEgZGVkaWNhdGVkIGZ1bmN0aW9uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI1NjQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHBy ZXBhcmF0aW9uIGZvciBzdXBwb3J0aW5nIG5vbi1hdG9taWMgaW5saW5lIGxldmVsIGJveGVzLgor CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVy OjpzaW1wbGlmaWVkQWxpZ25JbmxpbmVCb3hJZkFwcGxpY2FibGUgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hl cyk6CisKIDIwMjEtMDMtMDEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtJRkNdIE1vdmUgc2ltcGxpZmllZCB2ZXJ0aWNhbCBhbGlnbm1lbnQgY29tcHV0 YXRpb24gdG8gc3RydWN0IFNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBhOTA2YmFlNDIxZGE5 N2IyNjFkMjQ5YTI0M2IxZmZhODg5OTRmMjM0Li5lMDYyZTY2MzdjNjNiNjFlYTEyYmY4YTFmZGUz MGMzY2JiYjIyODRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcApAQCAtMjExLDYgKzIxMSwyNyBAQCBzdHJ1Y3QgU2ltcGxpZmllZFZlcnRpY2Fs QWxpZ25tZW50IHsKICAgICBJbmxpbmVMYXlvdXRVbml0IHJvb3RJbmxpbmVCb3hMb2dpY2FsVG9w KCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94TG9naWNhbFRvcDsgfQogICAgIElubGlu ZUxheW91dFVuaXQgbGluZUJveEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveExvZ2lj YWxCb3R0b20gLSBtX2xpbmVCb3hMb2dpY2FsVG9wOyB9CiAKKyAgICBib29sIGFsaWduSW5saW5l TGV2ZWxCb3hJZkFwcGxpY2FibGUoTGluZUJveDo6SW5saW5lTGV2ZWxCb3gmIGlubGluZUxldmVs Qm94LCBjb25zdCBCb3hHZW9tZXRyeSYgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeSkKKyAgICB7Cisg ICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVsQm94KCkpIHsKKyAg ICAgICAgICAgIC8vIEJhc2VsaW5lIGFsaWduZWQsIG5vbi1zdHJldGNoeSBkaXJlY3QgY2hpbGRy ZW4gYXJlIGNvbnNpZGVyZWQgdG8gYmUgc2ltcGxlIGZvciBub3cuCisgICAgICAgICAgICBhdXRv JiBsYXlvdXRCb3ggPSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKTsKKyAgICAgICAgICAgIGF1 dG8gaXNDb25zaWRlcmVkU2ltcGxlID0gJmxheW91dEJveC5wYXJlbnQoKSA9PSAmbV9yb290SW5s aW5lQm94LmxheW91dEJveCgpCisgICAgICAgICAgICAgICAgJiYgbGF5b3V0Qm94LnN0eWxlKCku dmVydGljYWxBbGlnbigpID09IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lCisgICAgICAgICAgICAg ICAgJiYgIWlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkKKyAgICAgICAgICAg ICAgICAmJiAhaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5BZnRlcigpCisgICAgICAgICAg ICAgICAgJiYgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5Cb3hIZWlnaHQoKSA8PSBtX3Jv b3RJbmxpbmVCb3guYmFzZWxpbmUoKTsKKyAgICAgICAgICAgIGlmICghaXNDb25zaWRlcmVkU2lt cGxlKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIC8vIE9ubHkg YmFzZWxpbmUgYWxpZ25tZW50IGZvciBub3cuCisgICAgICAgICAgICBpbmxpbmVMZXZlbEJveC5z ZXRMb2dpY2FsVG9wKG1fcm9vdElubGluZUJveC5iYXNlbGluZSgpIC0gaW5saW5lTGV2ZWxCb3gu YmFzZWxpbmUoKSk7CisgICAgICAgICAgICBhZGp1c3QoaW5saW5lTGV2ZWxCb3gpOworICAgICAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1F TlRFRF9ZRVQoKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KK3ByaXZhdGU6CiAgICAg dm9pZCBhZGp1c3QoY29uc3QgTGluZUJveDo6SW5saW5lTGV2ZWxCb3gmIGlubGluZUxldmVsQm94 KQogICAgIHsKICAgICAgICAgYXV0byBsYXlvdXRCb3VuZHNMb2dpY2FsVG9wID0gbV9yb290SW5s aW5lQm94LmxheW91dEJvdW5kcygpLmFzY2VudCAtIGlubGluZUxldmVsQm94LmxheW91dEJvdW5k cygpLmFzY2VudDsKQEAgLTIxOSwxMyArMjQwLDEzIEBAIHN0cnVjdCBTaW1wbGlmaWVkVmVydGlj YWxBbGlnbm1lbnQgewogICAgICAgICBtX3Jvb3RJbmxpbmVCb3hMb2dpY2FsVG9wID0gc3RkOjpt YXgobV9yb290SW5saW5lQm94TG9naWNhbFRvcCwgaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRz KCkuYXNjZW50IC0gbV9yb290SW5saW5lQm94LmJhc2VsaW5lKCkpOwogICAgIH0KIAotcHJpdmF0 ZToKICAgICBjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYgbV9yb290SW5saW5lQm94Owog CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2xpbmVCb3hMb2dpY2FsVG9wIHsgMCB9OwogICAgIElu bGluZUxheW91dFVuaXQgbV9saW5lQm94TG9naWNhbEJvdHRvbSB7IDAgfTsKICAgICBJbmxpbmVM YXlvdXRVbml0IG1fcm9vdElubGluZUJveExvZ2ljYWxUb3AgeyAwIH07CiB9OworCiB2b2lkIExp bmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gs IGNvbnN0IExpbmU6OlJ1bkxpc3QmIHJ1bnMpCiB7CiAgICAgYXV0byYgcm9vdElubGluZUJveCA9 IGxpbmVCb3gucm9vdElubGluZUJveCgpOwpAQCAtMzE3LDI2ICszMzgsMTAgQEAgdm9pZCBMaW5l Qm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBj b25zdCBMaW5lOjpSdW4KICAgICAgICAgICAgIGF1dG8gYXRvbWljSW5saW5lTGV2ZWxCb3ggPSBM aW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlQXRvbWljSW5saW5lTGV2ZWxCb3gobGF5b3V0 Qm94LCBsb2dpY2FsTGVmdCwgeyBpbmxpbmVMZXZlbEJveEdlb21ldHJ5LmJvcmRlckJveFdpZHRo KCksIG1hcmdpbkJveEhlaWdodCB9KTsKICAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94 LT5zZXRCYXNlbGluZShhc2NlbnQpOwogICAgICAgICAgICAgYXRvbWljSW5saW5lTGV2ZWxCb3gt PnNldExheW91dEJvdW5kcyhMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6TGF5b3V0Qm91bmRzIHsg YXNjZW50LCBtYXJnaW5Cb3hIZWlnaHQgLSBhc2NlbnQgfSk7Ci0gICAgICAgICAgICAvLyBMZXQn cyBwcmUtY29tcHV0ZSB0aGUgbG9naWNhbCB0b3Agc28gdGhhdCB3ZSBjYW4gYXZvaWQgcnVubmlu ZyB0aGUgYWxpZ25tZW50IG9uIHNpbXBsZSBpbmxpbmUgYm94ZXMuCi0gICAgICAgICAgICBhdXRv IGFsaWduSW5saW5lQm94SWZFbGlnaWJsZSA9IFsmXSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFt X3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCkKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICAgICAgICAgIC8vIEJhc2VsaW5lIGFsaWduZWQsIG5vbi1zdHJldGNoeSBk aXJlY3QgY2hpbGRyZW4gYXJlIGNvbnNpZGVyZWQgdG8gYmUgc2ltcGxlIGZvciBub3cuCi0gICAg ICAgICAgICAgICAgYXV0byBpc0NvbnNpZGVyZWRTaW1wbGUgPSAmbGF5b3V0Qm94LnBhcmVudCgp ID09ICZyb290Qm94KCkKLSAgICAgICAgICAgICAgICAgICAgJiYgbGF5b3V0Qm94LnN0eWxlKCku dmVydGljYWxBbGlnbigpID09IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lCi0gICAgICAgICAgICAg ICAgICAgICYmICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpCi0gICAgICAg ICAgICAgICAgICAgICYmICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkFmdGVyKCkKLSAg ICAgICAgICAgICAgICAgICAgJiYgbWFyZ2luQm94SGVpZ2h0IDw9IHJvb3RJbmxpbmVCb3guYmFz ZWxpbmUoKTsKLSAgICAgICAgICAgICAgICBpZiAoIWlzQ29uc2lkZXJlZFNpbXBsZSkgewotICAg ICAgICAgICAgICAgICAgICBtX3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCA9IGZhbHNl OwotICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgICAgIC8vIE9ubHkgYmFzZWxpbmUgYWxpZ25tZW50IGZvciBub3cuCi0gICAgICAgICAg ICAgICAgYXV0byBsb2dpY2FsVG9wID0gcm9vdElubGluZUJveC5iYXNlbGluZSgpIC0gYXNjZW50 OwotICAgICAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRMb2dpY2FsVG9wKGxv Z2ljYWxUb3ApOwotICAgICAgICAgICAgICAgIHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudC5h ZGp1c3QoKmF0b21pY0lubGluZUxldmVsQm94KTsKLSAgICAgICAgICAgIH07Ci0gICAgICAgICAg ICBhbGlnbklubGluZUJveElmRWxpZ2libGUoKTsKKyAgICAgICAgICAgIGlmIChtX3VzZVNpbXBs aWZpZWRWZXJ0aWNhbEFsaWdubWVudCkgeworICAgICAgICAgICAgICAgIC8vIExldCdzIHByZS1j b21wdXRlIHRoZSBsb2dpY2FsIHRvcCBzbyB0aGF0IHdlIGNhbiBhdm9pZCBydW5uaW5nIHRoZSBh bGlnbm1lbnQgb24gc2ltcGxlIGlubGluZSBsZXZlbCBib3hlcy4KKyAgICAgICAgICAgICAgICBt X3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCA9IHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdu bWVudC5hbGlnbklubGluZUxldmVsQm94SWZBcHBsaWNhYmxlKCphdG9taWNJbmxpbmVMZXZlbEJv eCwgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBs aW5lQm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsK ICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5kZXggMGMyMzQ0 NDY2ZDYyOTJjMzY5ZmZhZDNhMWM4MjQ5NDQ2MzNlM2Q5MC4uYjk0OWQ4MGNhZTI1ZWIyNGVkMmJi YmFmZGRkMzMzZTdiYjNjYTQ1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApAQCAtMzksNiArMzksNyBAQCBuYW1l c3BhY2UgTGF5b3V0IHsKIGNsYXNzIEJveEdlb21ldHJ5OwogY2xhc3MgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ7CiBjbGFzcyBMaW5lQm94QnVpbGRlcjsKK3N0cnVjdCBTaW1wbGlmaWVkVmVydGlj YWxBbGlnbm1lbnQ7CiAKIC8vICAgX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fIExpbmUgQm94CiAvLyB8ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTEwMyw2ICsxMDQsNyBA QCBwdWJsaWM6CiAgICAgICAgIElubGluZUxldmVsQm94KCkgPSBkZWZhdWx0OwogCiAgICAgcHJp dmF0ZToKKyAgICAgICAgZnJpZW5kIHN0cnVjdCBTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQ7 CiAgICAgICAgIGZyaWVuZCBjbGFzcyBMaW5lQm94QnVpbGRlcjsKICAgICAgICAgZnJpZW5kIGNs YXNzIExpbmVCb3g7CiAK 421900 2021-03-01 20:26:09 -0800 2021-03-01 21:01:01 -0800 Patch bug-222564-20210301202608.patch text/plain 6456 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE2NWE4NGEyYWM4YmZh MzBkN2Y1NTQyMmIwNmE1MTE5ZjMxYTAxYS4uODZmZTY5OGYyMDFjM2JjOGQ5MmU4NmQxNGQzYjYw MWU4NmQ0NTg0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIHNp bXBsaWZpZWQgYmFzZWxpbmUgYWxpZ25tZW50IHRvIGEgZGVkaWNhdGVkIGZ1bmN0aW9uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI1NjQKKworICAg ICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBUaGlzIGlzIGluIHBy ZXBhcmF0aW9uIGZvciBzdXBwb3J0aW5nIG5vbi1hdG9taWMgaW5saW5lIGxldmVsIGJveGVzLgor CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVy OjpzaW1wbGlmaWVkQWxpZ25JbmxpbmVCb3hJZkFwcGxpY2FibGUgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hl cyk6CisKIDIwMjEtMDMtMDEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtJRkNdIE1vdmUgc2ltcGxpZmllZCB2ZXJ0aWNhbCBhbGlnbm1lbnQgY29tcHV0 YXRpb24gdG8gc3RydWN0IFNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBhOTA2YmFlNDIxZGE5 N2IyNjFkMjQ5YTI0M2IxZmZhODg5OTRmMjM0Li5lMDYyZTY2MzdjNjNiNjFlYTEyYmY4YTFmZGUz MGMzY2JiYjIyODRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcApAQCAtMjExLDYgKzIxMSwyNyBAQCBzdHJ1Y3QgU2ltcGxpZmllZFZlcnRpY2Fs QWxpZ25tZW50IHsKICAgICBJbmxpbmVMYXlvdXRVbml0IHJvb3RJbmxpbmVCb3hMb2dpY2FsVG9w KCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94TG9naWNhbFRvcDsgfQogICAgIElubGlu ZUxheW91dFVuaXQgbGluZUJveEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveExvZ2lj YWxCb3R0b20gLSBtX2xpbmVCb3hMb2dpY2FsVG9wOyB9CiAKKyAgICBib29sIGFsaWduSW5saW5l TGV2ZWxCb3hJZkFwcGxpY2FibGUoTGluZUJveDo6SW5saW5lTGV2ZWxCb3gmIGlubGluZUxldmVs Qm94LCBjb25zdCBCb3hHZW9tZXRyeSYgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeSkKKyAgICB7Cisg ICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVsQm94KCkpIHsKKyAg ICAgICAgICAgIC8vIEJhc2VsaW5lIGFsaWduZWQsIG5vbi1zdHJldGNoeSBkaXJlY3QgY2hpbGRy ZW4gYXJlIGNvbnNpZGVyZWQgdG8gYmUgc2ltcGxlIGZvciBub3cuCisgICAgICAgICAgICBhdXRv JiBsYXlvdXRCb3ggPSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKTsKKyAgICAgICAgICAgIGF1 dG8gaXNDb25zaWRlcmVkU2ltcGxlID0gJmxheW91dEJveC5wYXJlbnQoKSA9PSAmbV9yb290SW5s aW5lQm94LmxheW91dEJveCgpCisgICAgICAgICAgICAgICAgJiYgbGF5b3V0Qm94LnN0eWxlKCku dmVydGljYWxBbGlnbigpID09IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lCisgICAgICAgICAgICAg ICAgJiYgIWlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkKKyAgICAgICAgICAg ICAgICAmJiAhaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5BZnRlcigpCisgICAgICAgICAg ICAgICAgJiYgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5Cb3hIZWlnaHQoKSA8PSBtX3Jv b3RJbmxpbmVCb3guYmFzZWxpbmUoKTsKKyAgICAgICAgICAgIGlmICghaXNDb25zaWRlcmVkU2lt cGxlKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIC8vIE9ubHkg YmFzZWxpbmUgYWxpZ25tZW50IGZvciBub3cuCisgICAgICAgICAgICBpbmxpbmVMZXZlbEJveC5z ZXRMb2dpY2FsVG9wKG1fcm9vdElubGluZUJveC5iYXNlbGluZSgpIC0gaW5saW5lTGV2ZWxCb3gu YmFzZWxpbmUoKSk7CisgICAgICAgICAgICBhZGp1c3QoaW5saW5lTGV2ZWxCb3gpOworICAgICAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1F TlRFRF9ZRVQoKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KK3ByaXZhdGU6CiAgICAg dm9pZCBhZGp1c3QoY29uc3QgTGluZUJveDo6SW5saW5lTGV2ZWxCb3gmIGlubGluZUxldmVsQm94 KQogICAgIHsKICAgICAgICAgYXV0byBsYXlvdXRCb3VuZHNMb2dpY2FsVG9wID0gbV9yb290SW5s aW5lQm94LmxheW91dEJvdW5kcygpLmFzY2VudCAtIGlubGluZUxldmVsQm94LmxheW91dEJvdW5k cygpLmFzY2VudDsKQEAgLTIxOSwxMyArMjQwLDEzIEBAIHN0cnVjdCBTaW1wbGlmaWVkVmVydGlj YWxBbGlnbm1lbnQgewogICAgICAgICBtX3Jvb3RJbmxpbmVCb3hMb2dpY2FsVG9wID0gc3RkOjpt YXgobV9yb290SW5saW5lQm94TG9naWNhbFRvcCwgaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRz KCkuYXNjZW50IC0gbV9yb290SW5saW5lQm94LmJhc2VsaW5lKCkpOwogICAgIH0KIAotcHJpdmF0 ZToKICAgICBjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYgbV9yb290SW5saW5lQm94Owog CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2xpbmVCb3hMb2dpY2FsVG9wIHsgMCB9OwogICAgIElu bGluZUxheW91dFVuaXQgbV9saW5lQm94TG9naWNhbEJvdHRvbSB7IDAgfTsKICAgICBJbmxpbmVM YXlvdXRVbml0IG1fcm9vdElubGluZUJveExvZ2ljYWxUb3AgeyAwIH07CiB9OworCiB2b2lkIExp bmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gs IGNvbnN0IExpbmU6OlJ1bkxpc3QmIHJ1bnMpCiB7CiAgICAgYXV0byYgcm9vdElubGluZUJveCA9 IGxpbmVCb3gucm9vdElubGluZUJveCgpOwpAQCAtMzE3LDI2ICszMzgsMTAgQEAgdm9pZCBMaW5l Qm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBj b25zdCBMaW5lOjpSdW4KICAgICAgICAgICAgIGF1dG8gYXRvbWljSW5saW5lTGV2ZWxCb3ggPSBM aW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlQXRvbWljSW5saW5lTGV2ZWxCb3gobGF5b3V0 Qm94LCBsb2dpY2FsTGVmdCwgeyBpbmxpbmVMZXZlbEJveEdlb21ldHJ5LmJvcmRlckJveFdpZHRo KCksIG1hcmdpbkJveEhlaWdodCB9KTsKICAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94 LT5zZXRCYXNlbGluZShhc2NlbnQpOwogICAgICAgICAgICAgYXRvbWljSW5saW5lTGV2ZWxCb3gt PnNldExheW91dEJvdW5kcyhMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6TGF5b3V0Qm91bmRzIHsg YXNjZW50LCBtYXJnaW5Cb3hIZWlnaHQgLSBhc2NlbnQgfSk7Ci0gICAgICAgICAgICAvLyBMZXQn cyBwcmUtY29tcHV0ZSB0aGUgbG9naWNhbCB0b3Agc28gdGhhdCB3ZSBjYW4gYXZvaWQgcnVubmlu ZyB0aGUgYWxpZ25tZW50IG9uIHNpbXBsZSBpbmxpbmUgYm94ZXMuCi0gICAgICAgICAgICBhdXRv IGFsaWduSW5saW5lQm94SWZFbGlnaWJsZSA9IFsmXSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFt X3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCkKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICAgICAgICAgIC8vIEJhc2VsaW5lIGFsaWduZWQsIG5vbi1zdHJldGNoeSBk aXJlY3QgY2hpbGRyZW4gYXJlIGNvbnNpZGVyZWQgdG8gYmUgc2ltcGxlIGZvciBub3cuCi0gICAg ICAgICAgICAgICAgYXV0byBpc0NvbnNpZGVyZWRTaW1wbGUgPSAmbGF5b3V0Qm94LnBhcmVudCgp ID09ICZyb290Qm94KCkKLSAgICAgICAgICAgICAgICAgICAgJiYgbGF5b3V0Qm94LnN0eWxlKCku dmVydGljYWxBbGlnbigpID09IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lCi0gICAgICAgICAgICAg ICAgICAgICYmICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpCi0gICAgICAg ICAgICAgICAgICAgICYmICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkFmdGVyKCkKLSAg ICAgICAgICAgICAgICAgICAgJiYgbWFyZ2luQm94SGVpZ2h0IDw9IHJvb3RJbmxpbmVCb3guYmFz ZWxpbmUoKTsKLSAgICAgICAgICAgICAgICBpZiAoIWlzQ29uc2lkZXJlZFNpbXBsZSkgewotICAg ICAgICAgICAgICAgICAgICBtX3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCA9IGZhbHNl OwotICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgICAgIC8vIE9ubHkgYmFzZWxpbmUgYWxpZ25tZW50IGZvciBub3cuCi0gICAgICAgICAg ICAgICAgYXV0byBsb2dpY2FsVG9wID0gcm9vdElubGluZUJveC5iYXNlbGluZSgpIC0gYXNjZW50 OwotICAgICAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRMb2dpY2FsVG9wKGxv Z2ljYWxUb3ApOwotICAgICAgICAgICAgICAgIHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudC5h ZGp1c3QoKmF0b21pY0lubGluZUxldmVsQm94KTsKLSAgICAgICAgICAgIH07Ci0gICAgICAgICAg ICBhbGlnbklubGluZUJveElmRWxpZ2libGUoKTsKKyAgICAgICAgICAgIGlmIChtX3VzZVNpbXBs aWZpZWRWZXJ0aWNhbEFsaWdubWVudCkgeworICAgICAgICAgICAgICAgIC8vIExldCdzIHByZS1j b21wdXRlIHRoZSBsb2dpY2FsIHRvcCBzbyB0aGF0IHdlIGNhbiBhdm9pZCBydW5uaW5nIHRoZSBh bGlnbm1lbnQgb24gc2ltcGxlIGlubGluZSBsZXZlbCBib3hlcy4KKyAgICAgICAgICAgICAgICBt X3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCA9IHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdu bWVudC5hbGlnbklubGluZUxldmVsQm94SWZBcHBsaWNhYmxlKCphdG9taWNJbmxpbmVMZXZlbEJv eCwgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBs aW5lQm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsK ICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5kZXggMGMyMzQ0 NDY2ZDYyOTJjMzY5ZmZhZDNhMWM4MjQ5NDQ2MzNlM2Q5MC4uYjk0OWQ4MGNhZTI1ZWIyNGVkMmJi YmFmZGRkMzMzZTdiYjNjYTQ1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApAQCAtMzksNiArMzksNyBAQCBuYW1l c3BhY2UgTGF5b3V0IHsKIGNsYXNzIEJveEdlb21ldHJ5OwogY2xhc3MgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ7CiBjbGFzcyBMaW5lQm94QnVpbGRlcjsKK3N0cnVjdCBTaW1wbGlmaWVkVmVydGlj YWxBbGlnbm1lbnQ7CiAKIC8vICAgX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fIExpbmUgQm94CiAvLyB8ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTEwMyw2ICsxMDQsNyBA QCBwdWJsaWM6CiAgICAgICAgIElubGluZUxldmVsQm94KCkgPSBkZWZhdWx0OwogCiAgICAgcHJp dmF0ZToKKyAgICAgICAgZnJpZW5kIHN0cnVjdCBTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQ7 CiAgICAgICAgIGZyaWVuZCBjbGFzcyBMaW5lQm94QnVpbGRlcjsKICAgICAgICAgZnJpZW5kIGNs YXNzIExpbmVCb3g7CiAK