237352 2022-03-01 19:20:37 -0800 [RTL] Incorrect alt text position in right to left context 2022-03-02 08:04:40 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=237366 InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1847283 0 zalan 2022-03-01 19:20:37 -0800 ssia 1847284 1 webkit-bug-importer 2022-03-01 19:20:57 -0800 <rdar://problem/89657704> 1847285 2 453561 zalan 2022-03-01 19:26:02 -0800 Created attachment 453561 Patch 1847286 3 453562 zalan 2022-03-01 19:26:48 -0800 Created attachment 453562 Patch 1847290 4 453565 zalan 2022-03-01 19:45:37 -0800 Created attachment 453565 Patch 1847291 5 453565 simon.fraser 2022-03-01 20:03:34 -0800 Comment on attachment 453565 Patch This is better but please file the followup to fix BIDI reordering. 1847369 6 ews-feeder 2022-03-02 06:50:44 -0800 Committed r290726 (247973@main): <https://commits.webkit.org/247973@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453565. 1847399 7 zalan 2022-03-02 08:04:22 -0800 (In reply to Simon Fraser (smfr) from comment #5) > Comment on attachment 453565 [details] > Patch > > This is better but please file the followup to fix BIDI reordering. tracked at bug 237366 453561 2022-03-01 19:26:02 -0800 2022-03-01 19:26:46 -0800 Patch bug-237352-20220301192601.patch text/plain 5618 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTUyMmJjM2YzZTBjNTYx MjFjNTcwYTljNWU4YjNiOTk1MTU2ZGZjMy4uNDgyYjkyNTlkZjYyNjY3NDM1YzBiNTc5YzcwMTg3 ZWJjN2E5MWQxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAzLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbUlRMXSBJbmNvcnJlY3QgYWx0 IHRleHQgcG9zaXRpb24gaW4gcmlnaHQgdG8gbGVmdCBjb250ZXh0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzczNTIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUYWtlIHRoZSBpbmxpbmUgZGlyZWN0aW9u IGludG8gYWNjb3VudCB3aGVuIGNvbXB1dGluZyB0aGUgYWx0IHRleHQgbG9jYXRpb24uCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVySW1hZ2U6OnBhaW50UmVwbGFjZWQpOiBUaGlzIGlzIG1vc3RseSBtb3ZpbmcgdGhpbmdzIGFy b3VuZC9tb2Rlcm5pemluZyBpdC4KKwogMjAyMi0wMy0wMSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjg1MjMyKSBodHRwczovL2FsdmFyb21v bnRvcm8uZ2l0aHViLmlvL2FsbW9uZC5jc3MvZGVtby8gbG9va3Mgd3JvbmcgaW4gU2FmYXJpLCBv ayBpbiBDaHJvbWUgYW5kIEZpcmVmb3gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJJbWFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1h Z2UuY3BwCmluZGV4IGM3YThkNjQ3ZTZmYTQ5MWE5YTNhZDUxZTU0YjQxMTJkODYxZmY0M2YuLjVh ZWI4ZDU3ZTM4ZjI3ODZhZTg2MmFkZTIwNzc5ODg5MTRkYjM3MmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcApAQCAtNDk3LDggKzQ5Nyw4IEBAIHZvaWQgUmVuZGVy SW1hZ2U6OnBhaW50UmVwbGFjZWQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBv aW50JiBwYWludE9mCiAgICAgICAgIGlmIChjb250ZW50U2l6ZS53aWR0aCgpID4gMiAmJiBjb250 ZW50U2l6ZS5oZWlnaHQoKSA+IDIpIHsKICAgICAgICAgICAgIExheW91dFVuaXQgbGVmdEJvcmRl ciA9IGJvcmRlckxlZnQoKTsKICAgICAgICAgICAgIExheW91dFVuaXQgdG9wQm9yZGVyID0gYm9y ZGVyVG9wKCk7Ci0gICAgICAgICAgICBMYXlvdXRVbml0IGxlZnRQYWQgPSBwYWRkaW5nTGVmdCgp OwotICAgICAgICAgICAgTGF5b3V0VW5pdCB0b3BQYWQgPSBwYWRkaW5nVG9wKCk7CisgICAgICAg ICAgICBMYXlvdXRVbml0IGxlZnRQYWRkaW5nID0gcGFkZGluZ0xlZnQoKTsKKyAgICAgICAgICAg IExheW91dFVuaXQgdG9wUGFkZGluZyA9IHBhZGRpbmdUb3AoKTsKIAogICAgICAgICAgICAgYm9v bCBlcnJvclBpY3R1cmVEcmF3biA9IGZhbHNlOwogICAgICAgICAgICAgTGF5b3V0U2l6ZSBpbWFn ZU9mZnNldDsKQEAgLTUyMiwzMCArNTIyLDM2IEBAIHZvaWQgUmVuZGVySW1hZ2U6OnBhaW50UmVw bGFjZWQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mCiAg ICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBjZW50ZXJZIHsgKHVzYWJsZVNpemUuaGVpZ2h0KCkg LSBpbWFnZVNpemUuaGVpZ2h0KCkpIC8gMiB9OwogICAgICAgICAgICAgICAgIGlmIChjZW50ZXJZ IDwgMCkKICAgICAgICAgICAgICAgICAgICAgY2VudGVyWSA9IDA7Ci0gICAgICAgICAgICAgICAg aW1hZ2VPZmZzZXQgPSBMYXlvdXRTaXplKGxlZnRCb3JkZXIgKyBsZWZ0UGFkICsgY2VudGVyWCAr IG1pc3NpbmdJbWFnZUJvcmRlcldpZHRoLCB0b3BCb3JkZXIgKyB0b3BQYWQgKyBjZW50ZXJZICsg bWlzc2luZ0ltYWdlQm9yZGVyV2lkdGgpOworICAgICAgICAgICAgICAgIGltYWdlT2Zmc2V0ID0g TGF5b3V0U2l6ZShsZWZ0Qm9yZGVyICsgbGVmdFBhZGRpbmcgKyBjZW50ZXJYICsgbWlzc2luZ0lt YWdlQm9yZGVyV2lkdGgsIHRvcEJvcmRlciArIHRvcFBhZGRpbmcgKyBjZW50ZXJZICsgbWlzc2lu Z0ltYWdlQm9yZGVyV2lkdGgpOwogCiAgICAgICAgICAgICAgICAgY29udGV4dC5kcmF3SW1hZ2Uo KmltYWdlLCBzbmFwUmVjdFRvRGV2aWNlUGl4ZWxzKExheW91dFJlY3QocGFpbnRPZmZzZXQgKyBp bWFnZU9mZnNldCwgaW1hZ2VTaXplKSwgZGV2aWNlU2NhbGVGYWN0b3IpLCB7IGltYWdlT3JpZW50 YXRpb24oKSB9KTsKICAgICAgICAgICAgICAgICBlcnJvclBpY3R1cmVEcmF3biA9IHRydWU7CiAg ICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmICghbV9hbHRUZXh0LmlzRW1wdHkoKSkgewot ICAgICAgICAgICAgICAgIFN0cmluZyB0ZXh0ID0gZG9jdW1lbnQoKS5kaXNwbGF5U3RyaW5nTW9k aWZpZWRCeUVuY29kaW5nKG1fYWx0VGV4dCk7Ci0gICAgICAgICAgICAgICAgY29udGV4dC5zZXRG aWxsQ29sb3Ioc3R5bGUoKS52aXNpdGVkRGVwZW5kZW50Q29sb3JXaXRoQ29sb3JGaWx0ZXIoQ1NT UHJvcGVydHlDb2xvcikpOwotICAgICAgICAgICAgICAgIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250 ID0gc3R5bGUoKS5mb250Q2FzY2FkZSgpOwotICAgICAgICAgICAgICAgIGNvbnN0IEZvbnRNZXRy aWNzJiBmb250TWV0cmljcyA9IGZvbnQubWV0cmljc09mUHJpbWFyeUZvbnQoKTsKLSAgICAgICAg ICAgICAgICBMYXlvdXRVbml0IGFzY2VudCA9IGZvbnRNZXRyaWNzLmFzY2VudCgpOwotICAgICAg ICAgICAgICAgIExheW91dFBvaW50IGFsdFRleHRPZmZzZXQgPSBwYWludE9mZnNldDsKLSAgICAg ICAgICAgICAgICBhbHRUZXh0T2Zmc2V0Lm1vdmUobGVmdEJvcmRlciArIGxlZnRQYWQgKyAocGFk ZGluZ1dpZHRoIC8gMikgLSBtaXNzaW5nSW1hZ2VCb3JkZXJXaWR0aCwgdG9wQm9yZGVyICsgdG9w UGFkICsgYXNjZW50ICsgKHBhZGRpbmdIZWlnaHQgLyAyKSAtIG1pc3NpbmdJbWFnZUJvcmRlcldp ZHRoKTsKLQotICAgICAgICAgICAgICAgIC8vIE9ubHkgZHJhdyB0aGUgYWx0IHRleHQgaWYgaXQn bGwgZml0IHdpdGhpbiB0aGUgY29udGVudCBib3gsCi0gICAgICAgICAgICAgICAgLy8gYW5kIG9u bHkgaWYgaXQgZml0cyBhYm92ZSB0aGUgZXJyb3IgaW1hZ2UuCi0gICAgICAgICAgICAgICAgVGV4 dFJ1biB0ZXh0UnVuID0gUmVuZGVyQmxvY2s6OmNvbnN0cnVjdFRleHRSdW4odGV4dCwgc3R5bGUo KSk7Ci0gICAgICAgICAgICAgICAgTGF5b3V0VW5pdCB0ZXh0V2lkdGggeyBmb250LndpZHRoKHRl eHRSdW4pIH07Ci0gICAgICAgICAgICAgICAgaWYgKGVycm9yUGljdHVyZURyYXduKSB7Ci0gICAg ICAgICAgICAgICAgICAgIGlmICh1c2FibGVTaXplLndpZHRoKCkgPj0gdGV4dFdpZHRoICYmIGZv bnRNZXRyaWNzLmhlaWdodCgpIDw9IGltYWdlT2Zmc2V0LmhlaWdodCgpKQotICAgICAgICAgICAg ICAgICAgICAgICAgY29udGV4dC5kcmF3QmlkaVRleHQoZm9udCwgdGV4dFJ1biwgYWx0VGV4dE9m ZnNldCk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIGlmICh1c2FibGVTaXplLndpZHRoKCkgPj0g dGV4dFdpZHRoICYmIHVzYWJsZVNpemUuaGVpZ2h0KCkgPj0gZm9udE1ldHJpY3MuaGVpZ2h0KCkp Ci0gICAgICAgICAgICAgICAgICAgIGNvbnRleHQuZHJhd0JpZGlUZXh0KGZvbnQsIHRleHRSdW4s IGFsdFRleHRPZmZzZXQpOworICAgICAgICAgICAgICAgIGF1dG8mIGZvbnQgPSBzdHlsZSgpLmZv bnRDYXNjYWRlKCk7CisgICAgICAgICAgICAgICAgYXV0byYgZm9udE1ldHJpY3MgPSBmb250Lm1l dHJpY3NPZlByaW1hcnlGb250KCk7CisgICAgICAgICAgICAgICAgYXV0byB0ZXh0UnVuID0gUmVu ZGVyQmxvY2s6OmNvbnN0cnVjdFRleHRSdW4oZG9jdW1lbnQoKS5kaXNwbGF5U3RyaW5nTW9kaWZp ZWRCeUVuY29kaW5nKG1fYWx0VGV4dCksIHN0eWxlKCkpOworICAgICAgICAgICAgICAgIGF1dG8g dGV4dFdpZHRoID0gTGF5b3V0VW5pdCB7IGZvbnQud2lkdGgodGV4dFJ1bikgfTsKKworICAgICAg ICAgICAgICAgIGF1dG8gaGFzUm9vbUZvckFsdFRleHQgPSBbJl0geworICAgICAgICAgICAgICAg ICAgICAvLyBPbmx5IGRyYXcgdGhlIGFsdCB0ZXh0IGlmIGl0J2xsIGZpdCB3aXRoaW4gdGhlIGNv bnRlbnQgYm94LAorICAgICAgICAgICAgICAgICAgICAvLyBhbmQgb25seSBpZiBpdCBmaXRzIGFi b3ZlIHRoZSBlcnJvciBpbWFnZS4KKyAgICAgICAgICAgICAgICAgICAgaWYgKHVzYWJsZVNpemUu d2lkdGgoKSA8IHRleHRXaWR0aCkKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGVycm9yUGljdHVyZURyYXduID8gZm9udE1l dHJpY3MuaGVpZ2h0KCkgPD0gaW1hZ2VPZmZzZXQuaGVpZ2h0KCkgOiB1c2FibGVTaXplLmhlaWdo dCgpID49IGZvbnRNZXRyaWNzLmhlaWdodCgpOworICAgICAgICAgICAgICAgIH07CisgICAgICAg ICAgICAgICAgaWYgKGhhc1Jvb21Gb3JBbHRUZXh0KCkpIHsKKyAgICAgICAgICAgICAgICAgICAg YXV0byBhbHRUZXh0TG9jYXRpb24gPSBbJl0oKSAtPiBMYXlvdXRQb2ludCB7CisgICAgICAgICAg ICAgICAgICAgICAgICBhdXRvIGNvbnRlbnRIb3Jpem9udGFsT2Zmc2V0ID0gTGF5b3V0VW5pdCB7 IGxlZnRCb3JkZXIgKyBsZWZ0UGFkZGluZyArIChwYWRkaW5nV2lkdGggLyAyKSAtIG1pc3NpbmdJ bWFnZUJvcmRlcldpZHRoIH07CisgICAgICAgICAgICAgICAgICAgICAgICBhdXRvIGNvbnRlbnRW ZXJ0aWNhbE9mZnNldCA9IExheW91dFVuaXQgeyB0b3BCb3JkZXIgKyB0b3BQYWRkaW5nICsgZm9u dE1ldHJpY3MuYXNjZW50KCkgKyAocGFkZGluZ0hlaWdodCAvIDIpIC0gbWlzc2luZ0ltYWdlQm9y ZGVyV2lkdGggfTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICghc3R5bGUoKS5pc0xlZnRU b1JpZ2h0RGlyZWN0aW9uKCkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGVudEhv cml6b250YWxPZmZzZXQgKz0gY29udGVudFNpemUud2lkdGgoKSAtIHRleHRXaWR0aDsKKyAgICAg ICAgICAgICAgICAgICAgICAgIHJldHVybiBwYWludE9mZnNldCArIExheW91dFBvaW50IHsgY29u dGVudEhvcml6b250YWxPZmZzZXQsIGNvbnRlbnRWZXJ0aWNhbE9mZnNldCB9OworICAgICAgICAg ICAgICAgICAgICB9OworICAgICAgICAgICAgICAgICAgICBjb250ZXh0LnNldEZpbGxDb2xvcihz dHlsZSgpLnZpc2l0ZWREZXBlbmRlbnRDb2xvcldpdGhDb2xvckZpbHRlcihDU1NQcm9wZXJ0eUNv bG9yKSk7CisgICAgICAgICAgICAgICAgICAgIGNvbnRleHQuZHJhd0JpZGlUZXh0KGZvbnQsIHRl eHRSdW4sIGFsdFRleHRMb2NhdGlvbigpKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuOwo= 453562 2022-03-01 19:26:48 -0800 2022-03-01 19:45:35 -0800 Patch bug-237352-20220301192647.patch text/plain 5653 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTUyMmJjM2YzZTBjNTYx MjFjNTcwYTljNWU4YjNiOTk1MTU2ZGZjMy4uZTM5NDk1N2UxOTMzYWE2ODQ2YWFlZmFmNmQ3Y2Vj OGU3Y2U5NTUyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAzLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbUlRMXSBJbmNvcnJlY3QgYWx0 IHRleHQgcG9zaXRpb24gaW4gcmlnaHQgdG8gbGVmdCBjb250ZXh0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzczNTIKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzg5NjU3NzA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRha2UgdGhlIGlubGluZSBkaXJlY3Rpb24gaW50byBhY2NvdW50IHdoZW4gY29t cHV0aW5nIHRoZSBhbHQgdGV4dCBsb2NhdGlvbi4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJJbWFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6cGFpbnRSZXBsYWNl ZCk6IFRoaXMgaXMgbW9zdGx5IG1vdmluZyB0aGluZ3MgYXJvdW5kL21vZGVybml6aW5nIGl0Lgor CiAyMDIyLTAzLTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OKHIyODUyMzIpIGh0dHBzOi8vYWx2YXJvbW9udG9yby5naXRodWIuaW8vYWxtb25k LmNzcy9kZW1vLyBsb29rcyB3cm9uZyBpbiBTYWZhcmksIG9rIGluIENocm9tZSBhbmQgRmlyZWZv eApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKaW5kZXggYzdhOGQ2NDdl NmZhNDkxYTlhM2FkNTFlNTRiNDExMmQ4NjFmZjQzZi4uNWFlYjhkNTdlMzhmMjc4NmFlODYyYWRl MjA3Nzk4ODkxNGRiMzcyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2Uu Y3BwCkBAIC00OTcsOCArNDk3LDggQEAgdm9pZCBSZW5kZXJJbWFnZTo6cGFpbnRSZXBsYWNlZChQ YWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2YKICAgICAgICAg aWYgKGNvbnRlbnRTaXplLndpZHRoKCkgPiAyICYmIGNvbnRlbnRTaXplLmhlaWdodCgpID4gMikg ewogICAgICAgICAgICAgTGF5b3V0VW5pdCBsZWZ0Qm9yZGVyID0gYm9yZGVyTGVmdCgpOwogICAg ICAgICAgICAgTGF5b3V0VW5pdCB0b3BCb3JkZXIgPSBib3JkZXJUb3AoKTsKLSAgICAgICAgICAg IExheW91dFVuaXQgbGVmdFBhZCA9IHBhZGRpbmdMZWZ0KCk7Ci0gICAgICAgICAgICBMYXlvdXRV bml0IHRvcFBhZCA9IHBhZGRpbmdUb3AoKTsKKyAgICAgICAgICAgIExheW91dFVuaXQgbGVmdFBh ZGRpbmcgPSBwYWRkaW5nTGVmdCgpOworICAgICAgICAgICAgTGF5b3V0VW5pdCB0b3BQYWRkaW5n ID0gcGFkZGluZ1RvcCgpOwogCiAgICAgICAgICAgICBib29sIGVycm9yUGljdHVyZURyYXduID0g ZmFsc2U7CiAgICAgICAgICAgICBMYXlvdXRTaXplIGltYWdlT2Zmc2V0OwpAQCAtNTIyLDMwICs1 MjIsMzYgQEAgdm9pZCBSZW5kZXJJbWFnZTo6cGFpbnRSZXBsYWNlZChQYWludEluZm8mIHBhaW50 SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2YKICAgICAgICAgICAgICAgICBMYXlvdXRV bml0IGNlbnRlclkgeyAodXNhYmxlU2l6ZS5oZWlnaHQoKSAtIGltYWdlU2l6ZS5oZWlnaHQoKSkg LyAyIH07CiAgICAgICAgICAgICAgICAgaWYgKGNlbnRlclkgPCAwKQogICAgICAgICAgICAgICAg ICAgICBjZW50ZXJZID0gMDsKLSAgICAgICAgICAgICAgICBpbWFnZU9mZnNldCA9IExheW91dFNp emUobGVmdEJvcmRlciArIGxlZnRQYWQgKyBjZW50ZXJYICsgbWlzc2luZ0ltYWdlQm9yZGVyV2lk dGgsIHRvcEJvcmRlciArIHRvcFBhZCArIGNlbnRlclkgKyBtaXNzaW5nSW1hZ2VCb3JkZXJXaWR0 aCk7CisgICAgICAgICAgICAgICAgaW1hZ2VPZmZzZXQgPSBMYXlvdXRTaXplKGxlZnRCb3JkZXIg KyBsZWZ0UGFkZGluZyArIGNlbnRlclggKyBtaXNzaW5nSW1hZ2VCb3JkZXJXaWR0aCwgdG9wQm9y ZGVyICsgdG9wUGFkZGluZyArIGNlbnRlclkgKyBtaXNzaW5nSW1hZ2VCb3JkZXJXaWR0aCk7CiAK ICAgICAgICAgICAgICAgICBjb250ZXh0LmRyYXdJbWFnZSgqaW1hZ2UsIHNuYXBSZWN0VG9EZXZp Y2VQaXhlbHMoTGF5b3V0UmVjdChwYWludE9mZnNldCArIGltYWdlT2Zmc2V0LCBpbWFnZVNpemUp LCBkZXZpY2VTY2FsZUZhY3RvciksIHsgaW1hZ2VPcmllbnRhdGlvbigpIH0pOwogICAgICAgICAg ICAgICAgIGVycm9yUGljdHVyZURyYXduID0gdHJ1ZTsKICAgICAgICAgICAgIH0KIAogICAgICAg ICAgICAgaWYgKCFtX2FsdFRleHQuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAgICAgU3RyaW5n IHRleHQgPSBkb2N1bWVudCgpLmRpc3BsYXlTdHJpbmdNb2RpZmllZEJ5RW5jb2RpbmcobV9hbHRU ZXh0KTsKLSAgICAgICAgICAgICAgICBjb250ZXh0LnNldEZpbGxDb2xvcihzdHlsZSgpLnZpc2l0 ZWREZXBlbmRlbnRDb2xvcldpdGhDb2xvckZpbHRlcihDU1NQcm9wZXJ0eUNvbG9yKSk7Ci0gICAg ICAgICAgICAgICAgY29uc3QgRm9udENhc2NhZGUmIGZvbnQgPSBzdHlsZSgpLmZvbnRDYXNjYWRl KCk7Ci0gICAgICAgICAgICAgICAgY29uc3QgRm9udE1ldHJpY3MmIGZvbnRNZXRyaWNzID0gZm9u dC5tZXRyaWNzT2ZQcmltYXJ5Rm9udCgpOwotICAgICAgICAgICAgICAgIExheW91dFVuaXQgYXNj ZW50ID0gZm9udE1ldHJpY3MuYXNjZW50KCk7Ci0gICAgICAgICAgICAgICAgTGF5b3V0UG9pbnQg YWx0VGV4dE9mZnNldCA9IHBhaW50T2Zmc2V0OwotICAgICAgICAgICAgICAgIGFsdFRleHRPZmZz ZXQubW92ZShsZWZ0Qm9yZGVyICsgbGVmdFBhZCArIChwYWRkaW5nV2lkdGggLyAyKSAtIG1pc3Np bmdJbWFnZUJvcmRlcldpZHRoLCB0b3BCb3JkZXIgKyB0b3BQYWQgKyBhc2NlbnQgKyAocGFkZGlu Z0hlaWdodCAvIDIpIC0gbWlzc2luZ0ltYWdlQm9yZGVyV2lkdGgpOwotCi0gICAgICAgICAgICAg ICAgLy8gT25seSBkcmF3IHRoZSBhbHQgdGV4dCBpZiBpdCdsbCBmaXQgd2l0aGluIHRoZSBjb250 ZW50IGJveCwKLSAgICAgICAgICAgICAgICAvLyBhbmQgb25seSBpZiBpdCBmaXRzIGFib3ZlIHRo ZSBlcnJvciBpbWFnZS4KLSAgICAgICAgICAgICAgICBUZXh0UnVuIHRleHRSdW4gPSBSZW5kZXJC bG9jazo6Y29uc3RydWN0VGV4dFJ1bih0ZXh0LCBzdHlsZSgpKTsKLSAgICAgICAgICAgICAgICBM YXlvdXRVbml0IHRleHRXaWR0aCB7IGZvbnQud2lkdGgodGV4dFJ1bikgfTsKLSAgICAgICAgICAg ICAgICBpZiAoZXJyb3JQaWN0dXJlRHJhd24pIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKHVz YWJsZVNpemUud2lkdGgoKSA+PSB0ZXh0V2lkdGggJiYgZm9udE1ldHJpY3MuaGVpZ2h0KCkgPD0g aW1hZ2VPZmZzZXQuaGVpZ2h0KCkpCi0gICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0LmRy YXdCaWRpVGV4dChmb250LCB0ZXh0UnVuLCBhbHRUZXh0T2Zmc2V0KTsKLSAgICAgICAgICAgICAg ICB9IGVsc2UgaWYgKHVzYWJsZVNpemUud2lkdGgoKSA+PSB0ZXh0V2lkdGggJiYgdXNhYmxlU2l6 ZS5oZWlnaHQoKSA+PSBmb250TWV0cmljcy5oZWlnaHQoKSkKLSAgICAgICAgICAgICAgICAgICAg Y29udGV4dC5kcmF3QmlkaVRleHQoZm9udCwgdGV4dFJ1biwgYWx0VGV4dE9mZnNldCk7CisgICAg ICAgICAgICAgICAgYXV0byYgZm9udCA9IHN0eWxlKCkuZm9udENhc2NhZGUoKTsKKyAgICAgICAg ICAgICAgICBhdXRvJiBmb250TWV0cmljcyA9IGZvbnQubWV0cmljc09mUHJpbWFyeUZvbnQoKTsK KyAgICAgICAgICAgICAgICBhdXRvIHRleHRSdW4gPSBSZW5kZXJCbG9jazo6Y29uc3RydWN0VGV4 dFJ1bihkb2N1bWVudCgpLmRpc3BsYXlTdHJpbmdNb2RpZmllZEJ5RW5jb2RpbmcobV9hbHRUZXh0 KSwgc3R5bGUoKSk7CisgICAgICAgICAgICAgICAgYXV0byB0ZXh0V2lkdGggPSBMYXlvdXRVbml0 IHsgZm9udC53aWR0aCh0ZXh0UnVuKSB9OworCisgICAgICAgICAgICAgICAgYXV0byBoYXNSb29t Rm9yQWx0VGV4dCA9IFsmXSB7CisgICAgICAgICAgICAgICAgICAgIC8vIE9ubHkgZHJhdyB0aGUg YWx0IHRleHQgaWYgaXQnbGwgZml0IHdpdGhpbiB0aGUgY29udGVudCBib3gsCisgICAgICAgICAg ICAgICAgICAgIC8vIGFuZCBvbmx5IGlmIGl0IGZpdHMgYWJvdmUgdGhlIGVycm9yIGltYWdlLgor ICAgICAgICAgICAgICAgICAgICBpZiAodXNhYmxlU2l6ZS53aWR0aCgpIDwgdGV4dFdpZHRoKQor ICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAgICAg ICByZXR1cm4gZXJyb3JQaWN0dXJlRHJhd24gPyBmb250TWV0cmljcy5oZWlnaHQoKSA8PSBpbWFn ZU9mZnNldC5oZWlnaHQoKSA6IHVzYWJsZVNpemUuaGVpZ2h0KCkgPj0gZm9udE1ldHJpY3MuaGVp Z2h0KCk7CisgICAgICAgICAgICAgICAgfTsKKyAgICAgICAgICAgICAgICBpZiAoaGFzUm9vbUZv ckFsdFRleHQoKSkgeworICAgICAgICAgICAgICAgICAgICBhdXRvIGFsdFRleHRMb2NhdGlvbiA9 IFsmXSgpIC0+IExheW91dFBvaW50IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGF1dG8gY29u dGVudEhvcml6b250YWxPZmZzZXQgPSBMYXlvdXRVbml0IHsgbGVmdEJvcmRlciArIGxlZnRQYWRk aW5nICsgKHBhZGRpbmdXaWR0aCAvIDIpIC0gbWlzc2luZ0ltYWdlQm9yZGVyV2lkdGggfTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGF1dG8gY29udGVudFZlcnRpY2FsT2Zmc2V0ID0gTGF5b3V0 VW5pdCB7IHRvcEJvcmRlciArIHRvcFBhZGRpbmcgKyBmb250TWV0cmljcy5hc2NlbnQoKSArIChw YWRkaW5nSGVpZ2h0IC8gMikgLSBtaXNzaW5nSW1hZ2VCb3JkZXJXaWR0aCB9OworICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKCFzdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZW50SG9yaXpvbnRhbE9mZnNldCArPSBjb250 ZW50U2l6ZS53aWR0aCgpIC0gdGV4dFdpZHRoOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIHBhaW50T2Zmc2V0ICsgTGF5b3V0UG9pbnQgeyBjb250ZW50SG9yaXpvbnRhbE9mZnNldCwg Y29udGVudFZlcnRpY2FsT2Zmc2V0IH07CisgICAgICAgICAgICAgICAgICAgIH07CisgICAgICAg ICAgICAgICAgICAgIGNvbnRleHQuc2V0RmlsbENvbG9yKHN0eWxlKCkudmlzaXRlZERlcGVuZGVu dENvbG9yV2l0aENvbG9yRmlsdGVyKENTU1Byb3BlcnR5Q29sb3IpKTsKKyAgICAgICAgICAgICAg ICAgICAgY29udGV4dC5kcmF3QmlkaVRleHQoZm9udCwgdGV4dFJ1biwgYWx0VGV4dExvY2F0aW9u KCkpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAg ICByZXR1cm47Cg== 453565 2022-03-01 19:45:37 -0800 2022-03-02 06:50:47 -0800 Patch bug-237352-20220301194536.patch text/plain 8183 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTUyMmJjM2YzZTBjNTYx MjFjNTcwYTljNWU4YjNiOTk1MTU2ZGZjMy4uZTM5NDk1N2UxOTMzYWE2ODQ2YWFlZmFmNmQ3Y2Vj OGU3Y2U5NTUyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAzLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbUlRMXSBJbmNvcnJlY3QgYWx0 IHRleHQgcG9zaXRpb24gaW4gcmlnaHQgdG8gbGVmdCBjb250ZXh0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzczNTIKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzg5NjU3NzA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRha2UgdGhlIGlubGluZSBkaXJlY3Rpb24gaW50byBhY2NvdW50IHdoZW4gY29t cHV0aW5nIHRoZSBhbHQgdGV4dCBsb2NhdGlvbi4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJJbWFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6cGFpbnRSZXBsYWNl ZCk6IFRoaXMgaXMgbW9zdGx5IG1vdmluZyB0aGluZ3MgYXJvdW5kL21vZGVybml6aW5nIGl0Lgor CiAyMDIyLTAzLTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OKHIyODUyMzIpIGh0dHBzOi8vYWx2YXJvbW9udG9yby5naXRodWIuaW8vYWxtb25k LmNzcy9kZW1vLyBsb29rcyB3cm9uZyBpbiBTYWZhcmksIG9rIGluIENocm9tZSBhbmQgRmlyZWZv eApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKaW5kZXggYzdhOGQ2NDdl NmZhNDkxYTlhM2FkNTFlNTRiNDExMmQ4NjFmZjQzZi4uNWFlYjhkNTdlMzhmMjc4NmFlODYyYWRl MjA3Nzk4ODkxNGRiMzcyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2Uu Y3BwCkBAIC00OTcsOCArNDk3LDggQEAgdm9pZCBSZW5kZXJJbWFnZTo6cGFpbnRSZXBsYWNlZChQ YWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2YKICAgICAgICAg aWYgKGNvbnRlbnRTaXplLndpZHRoKCkgPiAyICYmIGNvbnRlbnRTaXplLmhlaWdodCgpID4gMikg ewogICAgICAgICAgICAgTGF5b3V0VW5pdCBsZWZ0Qm9yZGVyID0gYm9yZGVyTGVmdCgpOwogICAg ICAgICAgICAgTGF5b3V0VW5pdCB0b3BCb3JkZXIgPSBib3JkZXJUb3AoKTsKLSAgICAgICAgICAg IExheW91dFVuaXQgbGVmdFBhZCA9IHBhZGRpbmdMZWZ0KCk7Ci0gICAgICAgICAgICBMYXlvdXRV bml0IHRvcFBhZCA9IHBhZGRpbmdUb3AoKTsKKyAgICAgICAgICAgIExheW91dFVuaXQgbGVmdFBh ZGRpbmcgPSBwYWRkaW5nTGVmdCgpOworICAgICAgICAgICAgTGF5b3V0VW5pdCB0b3BQYWRkaW5n ID0gcGFkZGluZ1RvcCgpOwogCiAgICAgICAgICAgICBib29sIGVycm9yUGljdHVyZURyYXduID0g ZmFsc2U7CiAgICAgICAgICAgICBMYXlvdXRTaXplIGltYWdlT2Zmc2V0OwpAQCAtNTIyLDMwICs1 MjIsMzYgQEAgdm9pZCBSZW5kZXJJbWFnZTo6cGFpbnRSZXBsYWNlZChQYWludEluZm8mIHBhaW50 SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2YKICAgICAgICAgICAgICAgICBMYXlvdXRV bml0IGNlbnRlclkgeyAodXNhYmxlU2l6ZS5oZWlnaHQoKSAtIGltYWdlU2l6ZS5oZWlnaHQoKSkg LyAyIH07CiAgICAgICAgICAgICAgICAgaWYgKGNlbnRlclkgPCAwKQogICAgICAgICAgICAgICAg ICAgICBjZW50ZXJZID0gMDsKLSAgICAgICAgICAgICAgICBpbWFnZU9mZnNldCA9IExheW91dFNp emUobGVmdEJvcmRlciArIGxlZnRQYWQgKyBjZW50ZXJYICsgbWlzc2luZ0ltYWdlQm9yZGVyV2lk dGgsIHRvcEJvcmRlciArIHRvcFBhZCArIGNlbnRlclkgKyBtaXNzaW5nSW1hZ2VCb3JkZXJXaWR0 aCk7CisgICAgICAgICAgICAgICAgaW1hZ2VPZmZzZXQgPSBMYXlvdXRTaXplKGxlZnRCb3JkZXIg KyBsZWZ0UGFkZGluZyArIGNlbnRlclggKyBtaXNzaW5nSW1hZ2VCb3JkZXJXaWR0aCwgdG9wQm9y ZGVyICsgdG9wUGFkZGluZyArIGNlbnRlclkgKyBtaXNzaW5nSW1hZ2VCb3JkZXJXaWR0aCk7CiAK ICAgICAgICAgICAgICAgICBjb250ZXh0LmRyYXdJbWFnZSgqaW1hZ2UsIHNuYXBSZWN0VG9EZXZp Y2VQaXhlbHMoTGF5b3V0UmVjdChwYWludE9mZnNldCArIGltYWdlT2Zmc2V0LCBpbWFnZVNpemUp LCBkZXZpY2VTY2FsZUZhY3RvciksIHsgaW1hZ2VPcmllbnRhdGlvbigpIH0pOwogICAgICAgICAg ICAgICAgIGVycm9yUGljdHVyZURyYXduID0gdHJ1ZTsKICAgICAgICAgICAgIH0KIAogICAgICAg ICAgICAgaWYgKCFtX2FsdFRleHQuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAgICAgU3RyaW5n IHRleHQgPSBkb2N1bWVudCgpLmRpc3BsYXlTdHJpbmdNb2RpZmllZEJ5RW5jb2RpbmcobV9hbHRU ZXh0KTsKLSAgICAgICAgICAgICAgICBjb250ZXh0LnNldEZpbGxDb2xvcihzdHlsZSgpLnZpc2l0 ZWREZXBlbmRlbnRDb2xvcldpdGhDb2xvckZpbHRlcihDU1NQcm9wZXJ0eUNvbG9yKSk7Ci0gICAg ICAgICAgICAgICAgY29uc3QgRm9udENhc2NhZGUmIGZvbnQgPSBzdHlsZSgpLmZvbnRDYXNjYWRl KCk7Ci0gICAgICAgICAgICAgICAgY29uc3QgRm9udE1ldHJpY3MmIGZvbnRNZXRyaWNzID0gZm9u dC5tZXRyaWNzT2ZQcmltYXJ5Rm9udCgpOwotICAgICAgICAgICAgICAgIExheW91dFVuaXQgYXNj ZW50ID0gZm9udE1ldHJpY3MuYXNjZW50KCk7Ci0gICAgICAgICAgICAgICAgTGF5b3V0UG9pbnQg YWx0VGV4dE9mZnNldCA9IHBhaW50T2Zmc2V0OwotICAgICAgICAgICAgICAgIGFsdFRleHRPZmZz ZXQubW92ZShsZWZ0Qm9yZGVyICsgbGVmdFBhZCArIChwYWRkaW5nV2lkdGggLyAyKSAtIG1pc3Np bmdJbWFnZUJvcmRlcldpZHRoLCB0b3BCb3JkZXIgKyB0b3BQYWQgKyBhc2NlbnQgKyAocGFkZGlu Z0hlaWdodCAvIDIpIC0gbWlzc2luZ0ltYWdlQm9yZGVyV2lkdGgpOwotCi0gICAgICAgICAgICAg ICAgLy8gT25seSBkcmF3IHRoZSBhbHQgdGV4dCBpZiBpdCdsbCBmaXQgd2l0aGluIHRoZSBjb250 ZW50IGJveCwKLSAgICAgICAgICAgICAgICAvLyBhbmQgb25seSBpZiBpdCBmaXRzIGFib3ZlIHRo ZSBlcnJvciBpbWFnZS4KLSAgICAgICAgICAgICAgICBUZXh0UnVuIHRleHRSdW4gPSBSZW5kZXJC bG9jazo6Y29uc3RydWN0VGV4dFJ1bih0ZXh0LCBzdHlsZSgpKTsKLSAgICAgICAgICAgICAgICBM YXlvdXRVbml0IHRleHRXaWR0aCB7IGZvbnQud2lkdGgodGV4dFJ1bikgfTsKLSAgICAgICAgICAg ICAgICBpZiAoZXJyb3JQaWN0dXJlRHJhd24pIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKHVz YWJsZVNpemUud2lkdGgoKSA+PSB0ZXh0V2lkdGggJiYgZm9udE1ldHJpY3MuaGVpZ2h0KCkgPD0g aW1hZ2VPZmZzZXQuaGVpZ2h0KCkpCi0gICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0LmRy YXdCaWRpVGV4dChmb250LCB0ZXh0UnVuLCBhbHRUZXh0T2Zmc2V0KTsKLSAgICAgICAgICAgICAg ICB9IGVsc2UgaWYgKHVzYWJsZVNpemUud2lkdGgoKSA+PSB0ZXh0V2lkdGggJiYgdXNhYmxlU2l6 ZS5oZWlnaHQoKSA+PSBmb250TWV0cmljcy5oZWlnaHQoKSkKLSAgICAgICAgICAgICAgICAgICAg Y29udGV4dC5kcmF3QmlkaVRleHQoZm9udCwgdGV4dFJ1biwgYWx0VGV4dE9mZnNldCk7CisgICAg ICAgICAgICAgICAgYXV0byYgZm9udCA9IHN0eWxlKCkuZm9udENhc2NhZGUoKTsKKyAgICAgICAg ICAgICAgICBhdXRvJiBmb250TWV0cmljcyA9IGZvbnQubWV0cmljc09mUHJpbWFyeUZvbnQoKTsK KyAgICAgICAgICAgICAgICBhdXRvIHRleHRSdW4gPSBSZW5kZXJCbG9jazo6Y29uc3RydWN0VGV4 dFJ1bihkb2N1bWVudCgpLmRpc3BsYXlTdHJpbmdNb2RpZmllZEJ5RW5jb2RpbmcobV9hbHRUZXh0 KSwgc3R5bGUoKSk7CisgICAgICAgICAgICAgICAgYXV0byB0ZXh0V2lkdGggPSBMYXlvdXRVbml0 IHsgZm9udC53aWR0aCh0ZXh0UnVuKSB9OworCisgICAgICAgICAgICAgICAgYXV0byBoYXNSb29t Rm9yQWx0VGV4dCA9IFsmXSB7CisgICAgICAgICAgICAgICAgICAgIC8vIE9ubHkgZHJhdyB0aGUg YWx0IHRleHQgaWYgaXQnbGwgZml0IHdpdGhpbiB0aGUgY29udGVudCBib3gsCisgICAgICAgICAg ICAgICAgICAgIC8vIGFuZCBvbmx5IGlmIGl0IGZpdHMgYWJvdmUgdGhlIGVycm9yIGltYWdlLgor ICAgICAgICAgICAgICAgICAgICBpZiAodXNhYmxlU2l6ZS53aWR0aCgpIDwgdGV4dFdpZHRoKQor ICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAgICAg ICByZXR1cm4gZXJyb3JQaWN0dXJlRHJhd24gPyBmb250TWV0cmljcy5oZWlnaHQoKSA8PSBpbWFn ZU9mZnNldC5oZWlnaHQoKSA6IHVzYWJsZVNpemUuaGVpZ2h0KCkgPj0gZm9udE1ldHJpY3MuaGVp Z2h0KCk7CisgICAgICAgICAgICAgICAgfTsKKyAgICAgICAgICAgICAgICBpZiAoaGFzUm9vbUZv ckFsdFRleHQoKSkgeworICAgICAgICAgICAgICAgICAgICBhdXRvIGFsdFRleHRMb2NhdGlvbiA9 IFsmXSgpIC0+IExheW91dFBvaW50IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGF1dG8gY29u dGVudEhvcml6b250YWxPZmZzZXQgPSBMYXlvdXRVbml0IHsgbGVmdEJvcmRlciArIGxlZnRQYWRk aW5nICsgKHBhZGRpbmdXaWR0aCAvIDIpIC0gbWlzc2luZ0ltYWdlQm9yZGVyV2lkdGggfTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGF1dG8gY29udGVudFZlcnRpY2FsT2Zmc2V0ID0gTGF5b3V0 VW5pdCB7IHRvcEJvcmRlciArIHRvcFBhZGRpbmcgKyBmb250TWV0cmljcy5hc2NlbnQoKSArIChw YWRkaW5nSGVpZ2h0IC8gMikgLSBtaXNzaW5nSW1hZ2VCb3JkZXJXaWR0aCB9OworICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKCFzdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZW50SG9yaXpvbnRhbE9mZnNldCArPSBjb250 ZW50U2l6ZS53aWR0aCgpIC0gdGV4dFdpZHRoOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIHBhaW50T2Zmc2V0ICsgTGF5b3V0UG9pbnQgeyBjb250ZW50SG9yaXpvbnRhbE9mZnNldCwg Y29udGVudFZlcnRpY2FsT2Zmc2V0IH07CisgICAgICAgICAgICAgICAgICAgIH07CisgICAgICAg ICAgICAgICAgICAgIGNvbnRleHQuc2V0RmlsbENvbG9yKHN0eWxlKCkudmlzaXRlZERlcGVuZGVu dENvbG9yV2l0aENvbG9yRmlsdGVyKENTU1Byb3BlcnR5Q29sb3IpKTsKKyAgICAgICAgICAgICAg ICAgICAgY29udGV4dC5kcmF3QmlkaVRleHQoZm9udCwgdGV4dFJ1biwgYWx0VGV4dExvY2F0aW9u KCkpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAg ICByZXR1cm47CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggYmE1ZjM2NmQyNjEyM2RkZWE5MjUyZDhmYjk5YzE4NjI2MDljYTVm My4uOTk2MTNjNWNjZWZjMjI5ZDNjODdkNDYwNmVjNjZkMDJlZjM1MjNhZCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDIyLTAzLTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKwor ICAgICAgICBbUlRMXSBJbmNvcnJlY3QgYWx0IHRleHQgcG9zaXRpb24gaW4gcmlnaHQgdG8gbGVm dCBjb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzczNTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg5NjU3NzA0PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9pbWFnZXMvYWx0LXRl eHQtd2l0aC1yaWdodC10by1sZWZ0LWlubGluZS1kaXJlY3Rpb24tZXhwZWN0ZWQtbWlzbWF0Y2gu aHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9pbWFnZXMvYWx0LXRleHQtd2l0aC1yaWdodC10 by1sZWZ0LWlubGluZS1kaXJlY3Rpb24uaHRtbDogQWRkZWQuCisKIDIwMjItMDMtMDEgIEpvbiBM ZWUgIDxqb25sZWVAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZ2FyZGVuaW5nLgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvYWx0LXRleHQtd2l0aC1yaWdodC10 by1sZWZ0LWlubGluZS1kaXJlY3Rpb24tZXhwZWN0ZWQtbWlzbWF0Y2guaHRtbCBiL0xheW91dFRl c3RzL2Zhc3QvaW1hZ2VzL2FsdC10ZXh0LXdpdGgtcmlnaHQtdG8tbGVmdC1pbmxpbmUtZGlyZWN0 aW9uLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTIyYjgyNmNmMzZlYTdiYzgy YWE5ZWE4MmRkMDI3ODJhMjU2OThmZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvaW1hZ2VzL2FsdC10ZXh0LXdpdGgtcmlnaHQtdG8tbGVmdC1pbmxpbmUtZGlyZWN0aW9uLWV4 cGVjdGVkLW1pc21hdGNoLmh0bWwKQEAgLTAsMCArMSwxNyBAQAorPHN0eWxlPgorLmNvbnRhaW5l ciB7CisgIGRpcmVjdGlvbjogbHRyOworICBmb250LXNpemU6IDEwcHg7CisgIGZvbnQtZmFtaWx5 OiBBaGVtOworfQorCitpbWcgeworICB3aWR0aDogMjAwcHg7CisgIGhlaWdodDogMTAwcHg7Cit9 Cis8L3N0eWxlPgorPGRpdiBzdHlsZT0id2lkdGg6IDIxMHB4OyI+Cis8ZGl2IGNsYXNzPWNvbnRh aW5lcj48aW1nIHNyYz0iYnJva2VuIiBzdHlsZT0id2lkdGg6IDIxMHB4OyIgYWx0PSJyaWdodCB0 byBsZWZ0Ij48L2Rpdj4KKzxkaXYgY2xhc3M9Y29udGFpbmVyPjxpbWcgc3JjPSJicm9rZW4iIHN0 eWxlPSJwYWRkaW5nLWxlZnQ6IDEwcHg7IiBhbHQ9InJpZ2h0IHRvIGxlZnQiPjwvZGl2PgorPGRp diBjbGFzcz1jb250YWluZXI+PGltZyBzcmM9ImJyb2tlbiIgc3R5bGU9InBhZGRpbmctcmlnaHQ6 IDEwcHg7IiBhbHQ9InJpZ2h0IHRvIGxlZnQiPjwvZGl2PgorPC9kaXY+ClwgTm8gbmV3bGluZSBh dCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvYWx0LXRl eHQtd2l0aC1yaWdodC10by1sZWZ0LWlubGluZS1kaXJlY3Rpb24uaHRtbCBiL0xheW91dFRlc3Rz L2Zhc3QvaW1hZ2VzL2FsdC10ZXh0LXdpdGgtcmlnaHQtdG8tbGVmdC1pbmxpbmUtZGlyZWN0aW9u Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uMDRmMjhiN2M5MDZkMmQ4MTA0Y2VkNTc0NGZjM2I2MzE5NmFhOGUx YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL2FsdC10ZXh0LXdp dGgtcmlnaHQtdG8tbGVmdC1pbmxpbmUtZGlyZWN0aW9uLmh0bWwKQEAgLTAsMCArMSwxNyBAQAor PHN0eWxlPgorLmNvbnRhaW5lciB7CisgIGRpcmVjdGlvbjogcnRsOworICBmb250LXNpemU6IDEw cHg7CisgIGZvbnQtZmFtaWx5OiBBaGVtOworfQorCitpbWcgeworICB3aWR0aDogMjAwcHg7Cisg IGhlaWdodDogMTAwcHg7Cit9Cis8L3N0eWxlPgorPGRpdiBzdHlsZT0id2lkdGg6IDIxMHB4OyI+ Cis8ZGl2IGNsYXNzPWNvbnRhaW5lcj48aW1nIHNyYz0iYnJva2VuIiBzdHlsZT0id2lkdGg6IDIx MHB4OyIgYWx0PSJyaWdodCB0byBsZWZ0Ij48L2Rpdj4KKzxkaXYgY2xhc3M9Y29udGFpbmVyPjxp bWcgc3JjPSJicm9rZW4iIHN0eWxlPSJwYWRkaW5nLWxlZnQ6IDEwcHg7IiBhbHQ9InJpZ2h0IHRv IGxlZnQiPjwvZGl2PgorPGRpdiBjbGFzcz1jb250YWluZXI+PGltZyBzcmM9ImJyb2tlbiIgc3R5 bGU9InBhZGRpbmctcmlnaHQ6IDEwcHg7IiBhbHQ9InJpZ2h0IHRvIGxlZnQiPjwvZGl2PgorPC9k aXY+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo=