249923 2022-12-28 04:58:11 -0800 REGRESSION (Safari 14-16): Duplicated CR-LF in textarea with wrap="hard" 2023-01-12 07:54:58 -0800 1 1 1 Unclassified WebKit Layout and Rendering Safari 16 All macOS 13 RESOLVED FIXED InRadar P2 Normal --- 1 kowaraj4stuff zalan akeerthi bfulgham cdumez changseok esprehn+autocc ews-watchlist fujii gyuyoung.kim koivisto kowaraj4stuff mifenton mmaxfield simon.fraser webkit-bug-importer zalan oldest_to_newest 1922075 0 kowaraj4stuff 2022-12-28 04:58:11 -0800 If I submit a form with a textarea containing "A0d0aB" it sends "A0d0a0d0aB". If I submit a form with a textarea containing "A0d0a0d0aB" it sends "A0d0a0d0a0d0a0d0aB". (each CR-LF pair gets duplicated) It works fine from Chrome and the old Safari, but not the new one. I couldn't find how to get the specific version of the WebKit. OK: from Safari (Version 14.0.2 (15610.3.7.1.10 15610), detected by httpd as: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.2 Safari/605.1.15" DUPLICATED: from Safari (Version 16.1 (17614.2.9.1.13, 17614), detected by httpd as: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Safari/605.1.15" It seems to be related to: https://bugs.webkit.org/show_bug.cgi?id=249916 It seemed to happened at around the time of this change: https://trac.webkit.org/changeset/293672/webkit/ 1922076 1 kowaraj4stuff 2022-12-28 05:02:06 -0800 Also OK from Chrome, detected by httpd as: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36" 1922158 2 kowaraj4stuff 2022-12-29 03:41:31 -0800 And as I expected, as soon as I upgraded iPadOS to 16.2 my Chrome is detected as AppleWEbKit/605.1.15 now and all the CR-LF pairs get duplicated! 1922164 3 kowaraj4stuff 2022-12-29 04:49:19 -0800 I have just reproduced the bug with the latest version for Monterey: 258350@main DECEMBER 29, 2022 AT 03:43 AM GMT+1 downloaded from here: https://s3-us-west-2.amazonaws.com/minified-archives.webkit.org/mac-monterey-x86_64%20arm64-release/258350@main.zip 1922273 4 kowaraj4stuff 2022-12-30 02:57:38 -0800 It only happens if a textarea has [wrap="hard"] attributes! If the attribute is removed, there are no more duplications. 1922839 5 webkit-bug-importer 2023-01-04 04:59:17 -0800 <rdar://problem/103870498> 1922957 6 464336 fujii 2023-01-04 13:11:25 -0800 Created attachment 464336 test case 1922958 7 fujii 2023-01-04 13:12:20 -0800 I did bisecting with my WinCairo collection. r281133 good r281553 bad 1922963 8 fujii 2023-01-04 13:18:37 -0800 240773@main (bug#228882) seems to be suspicious. 1922972 9 zalan 2023-01-04 13:37:38 -0800 (In reply to Fujii Hironori from comment #8) > 240773@main (bug#228882) seems to be suspicious. yeah that's a strong candidate. 1924974 10 464463 zalan 2023-01-11 20:20:42 -0800 Created attachment 464463 Patch 1924976 11 464464 zalan 2023-01-11 20:23:03 -0800 Created attachment 464464 Patch 1925060 12 ews-feeder 2023-01-12 07:54:54 -0800 Committed 258830@main (4dde2b983f43): <https://commits.webkit.org/258830@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 464464. 464336 2023-01-04 13:11:25 -0800 2023-01-04 13:11:25 -0800 test case a.html text/html 186 fujii PCFET0NUWVBFIGh0bWw+CjxodG1sPgogIDxib2R5PgoKICAgIDxmb3JtIGFjdGlvbj0iIyI+CiAg ICAgIDx0ZXh0YXJlYSBjb2xzPSIzMCIgbmFtZT0idHh0IiB3cmFwPSJoYXJkIj4KeAp5CiAgICAg IDwvdGV4dGFyZWE+CiAgICAgIDxpbnB1dCB0eXBlPSJzdWJtaXQiPgogICAgPC9mb3JtPgoKICA8 L2JvZHk+CjwvaHRtbD4K 464463 2023-01-11 20:20:42 -0800 2023-01-11 20:23:01 -0800 Patch bug-249923-20230111202041.patch text/plain 3835 zalan RnJvbSAxYWE4MzNmNWU4YjI3NDM5NmQ4ZmY3NTYzZjQ0MjBkOTIxZmY5NzY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMTEgSmFuIDIwMjMgMjA6MTE6NTQgLTA4MDAKU3ViamVjdDogW1BBVENIXSBSRUdSRVNT SU9OIChTYWZhcmkgMTQtMTYpOiBEdXBsaWNhdGVkIENSLUxGIGluIHRleHRhcmVhIHdpdGgKIHdy YXA9ImhhcmQiIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDk5MjMK IDxyZGFyOi8vcHJvYmxlbS8xMDM4NzA0OTg+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K ClRoaXMgd2FzIGNhdXNlZCBieSBhIHNsaWdodCBjb25mdXNpb24gb2Ygd2hlbiBsZWdhY3kgbGlu ZSBsYXlvdXQgc2V0cyAiZW5kc1dpdGhCcmVhayIgb24gYSBsaW5lLgpXaGlsZSBpbml0aWFsbHkg dGhpcyBiaXQgd2FzIGludHJvZHVjZWQgZm9yIDxicj4gKHByZXZpb3VzTGluZUJyb2tlQXRCUiks IG92ZXIgdGltZSBpdAp0dXJuZWQgaW50byBhICJhbnkgdHlwZSBvZiBsaW5lIGJyZWFrIiBiaXQu CnNraXBUb05leHRTb2Z0TGluZUJyZWFrUG9zaXRpb24gbm93IGNoZWNrcyBmb3IgImFueSBsaW5l IGJyZWFrIiBhbmQgYWxzbyBpZ25vcmVzIHRoZSBsYXN0IGxpbmUuCgoqIFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuY3BwOgooV2ViQ29yZTo6SFRNTFRleHRG b3JtQ29udHJvbEVsZW1lbnQ6OnZhbHVlV2l0aEhhcmRMaW5lQnJlYWtzIGNvbnN0KToKLS0tCiAu Li4vaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHAgICAgICAgfCAzMSArKysrKysr KystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250 cm9sRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0Rm9ybUNvbnRyb2xF bGVtZW50LmNwcAppbmRleCA0N2EyNzViN2NlOGMuLjkzNDA4NDJmMzNlZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHAKQEAgLTc0 MiwyNyArNzQyLDI2IEBAIFN0cmluZyBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6dmFsdWVX aXRoSGFyZExpbmVCcmVha3MoKSBjb25zdAogICAgIGlmICghcmVuZGVyZXIpCiAgICAgICAgIHJl dHVybiB2YWx1ZSgpOwogCi0gICAgTm9kZSogc29mdExpbmVCcmVha05vZGUgPSBudWxscHRyOwot ICAgIHVuc2lnbmVkIHNvZnRMaW5lQnJlYWtPZmZzZXQgPSAwOworICAgIE5vZGUqIGJyZWFrTm9k ZSA9IG51bGxwdHI7CisgICAgdW5zaWduZWQgYnJlYWtPZmZzZXQgPSAwOwogICAgIGF1dG8gY3Vy cmVudExpbmVCb3ggPSBJbmxpbmVJdGVyYXRvcjo6Zmlyc3RMaW5lQm94Rm9yKCpyZW5kZXJlcik7 CiAgICAgaWYgKCFjdXJyZW50TGluZUJveCkKICAgICAgICAgcmV0dXJuIHZhbHVlKCk7CiAKICAg ICBhdXRvIHNraXBUb05leHRTb2Z0TGluZUJyZWFrUG9zaXRpb24gPSBbJl0gewotICAgICAgICBm b3IgKDsgY3VycmVudExpbmVCb3g7IGN1cnJlbnRMaW5lQm94LnRyYXZlcnNlTmV4dCgpKSB7Cisg ICAgICAgIHdoaWxlIChjdXJyZW50TGluZUJveCkgewogICAgICAgICAgICAgYXV0byBsYXN0UnVu ID0gY3VycmVudExpbmVCb3gtPmxhc3RMZWFmQm94KCk7CiAgICAgICAgICAgICBBU1NFUlQobGFz dFJ1bik7Ci0gICAgICAgICAgICBhdXRvJiByZW5kZXJlciA9IGxhc3RSdW4tPnJlbmRlcmVyKCk7 Ci0gICAgICAgICAgICBhdXRvIGxpbmVFbmRzV2l0aEJSID0gaXM8UmVuZGVyTGluZUJyZWFrPihy ZW5kZXJlcikgJiYgIWRvd25jYXN0PFJlbmRlckxpbmVCcmVhaz4ocmVuZGVyZXIpLmlzV0JSKCk7 Ci0gICAgICAgICAgICBpZiAoIWxpbmVFbmRzV2l0aEJSKSB7Ci0gICAgICAgICAgICAgICAgc29m dExpbmVCcmVha05vZGUgPSByZW5kZXJlci5ub2RlKCk7Ci0gICAgICAgICAgICAgICAgc29mdExp bmVCcmVha09mZnNldCA9IGxhc3RSdW4tPm1heGltdW1DYXJldE9mZnNldCgpOwotICAgICAgICAg ICAgICAgIGN1cnJlbnRMaW5lQm94LnRyYXZlcnNlTmV4dCgpOworICAgICAgICAgICAgLy8gU2tp cCBsYXN0IGxpbmUuCisgICAgICAgICAgICBjdXJyZW50TGluZUJveC50cmF2ZXJzZU5leHQoKTsK KyAgICAgICAgICAgIGlmIChjdXJyZW50TGluZUJveCAmJiAhbGFzdFJ1bi0+aXNMaW5lQnJlYWso KSkgeworICAgICAgICAgICAgICAgIGJyZWFrTm9kZSA9IGxhc3RSdW4tPnJlbmRlcmVyKCkubm9k ZSgpOworICAgICAgICAgICAgICAgIGJyZWFrT2Zmc2V0ID0gbGFzdFJ1bi0+bWF4aW11bUNhcmV0 T2Zmc2V0KCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogICAgICAg ICB9Ci0gICAgICAgIHNvZnRMaW5lQnJlYWtOb2RlID0gbnVsbHB0cjsKLSAgICAgICAgc29mdExp bmVCcmVha09mZnNldCA9IDA7CisgICAgICAgIGJyZWFrTm9kZSA9IG51bGxwdHI7CisgICAgICAg IGJyZWFrT2Zmc2V0ID0gMDsKICAgICB9OwogCiAgICAgc2tpcFRvTmV4dFNvZnRMaW5lQnJlYWtQ b3NpdGlvbigpOwpAQCAtNzc1LDE3ICs3NzQsMTcgQEAgU3RyaW5nIEhUTUxUZXh0Rm9ybUNvbnRy b2xFbGVtZW50Ojp2YWx1ZVdpdGhIYXJkTGluZUJyZWFrcygpIGNvbnN0CiAgICAgICAgICAgICBT dHJpbmcgZGF0YSA9IGRvd25jYXN0PFRleHQ+KCpub2RlKS5kYXRhKCk7CiAgICAgICAgICAgICB1 bnNpZ25lZCBsZW5ndGggPSBkYXRhLmxlbmd0aCgpOwogICAgICAgICAgICAgdW5zaWduZWQgcG9z aXRpb24gPSAwOwotICAgICAgICAgICAgd2hpbGUgKHNvZnRMaW5lQnJlYWtOb2RlID09IG5vZGUg JiYgc29mdExpbmVCcmVha09mZnNldCA8PSBsZW5ndGgpIHsKLSAgICAgICAgICAgICAgICBpZiAo c29mdExpbmVCcmVha09mZnNldCA+IHBvc2l0aW9uKSB7Ci0gICAgICAgICAgICAgICAgICAgIHJl c3VsdC5hcHBlbmRTdWJzdHJpbmcoZGF0YSwgcG9zaXRpb24sIHNvZnRMaW5lQnJlYWtPZmZzZXQg LSBwb3NpdGlvbik7Ci0gICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gc29mdExpbmVCcmVh a09mZnNldDsKKyAgICAgICAgICAgIHdoaWxlIChicmVha05vZGUgPT0gbm9kZSAmJiBicmVha09m ZnNldCA8PSBsZW5ndGgpIHsKKyAgICAgICAgICAgICAgICBpZiAoYnJlYWtPZmZzZXQgPiBwb3Np dGlvbikgeworICAgICAgICAgICAgICAgICAgICByZXN1bHQuYXBwZW5kU3Vic3RyaW5nKGRhdGEs IHBvc2l0aW9uLCBicmVha09mZnNldCAtIHBvc2l0aW9uKTsKKyAgICAgICAgICAgICAgICAgICAg cG9zaXRpb24gPSBicmVha09mZnNldDsKICAgICAgICAgICAgICAgICAgICAgcmVzdWx0LmFwcGVu ZChuZXdsaW5lQ2hhcmFjdGVyKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAg c2tpcFRvTmV4dFNvZnRMaW5lQnJlYWtQb3NpdGlvbigpOwogICAgICAgICAgICAgfQogICAgICAg ICAgICAgcmVzdWx0LmFwcGVuZFN1YnN0cmluZyhkYXRhLCBwb3NpdGlvbiwgbGVuZ3RoIC0gcG9z aXRpb24pOwogICAgICAgICB9Ci0gICAgICAgIHdoaWxlIChzb2Z0TGluZUJyZWFrTm9kZSA9PSBu b2RlKQorICAgICAgICB3aGlsZSAoYnJlYWtOb2RlID09IG5vZGUpCiAgICAgICAgICAgICBza2lw VG9OZXh0U29mdExpbmVCcmVha1Bvc2l0aW9uKCk7CiAgICAgfQogICAgIHN0cmlwVHJhaWxpbmdO ZXdsaW5lKHJlc3VsdCk7Cg== 464464 2023-01-11 20:23:03 -0800 2023-01-12 07:54:56 -0800 Patch bug-249923-20230111202302.patch text/plain 5423 zalan RnJvbSBhYmY0Njg4M2E2ZTE1Mjk3NTE4ZWY5MjE1ZTcwN2VmN2MwNmE2ZWM3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMTEgSmFuIDIwMjMgMjA6MTE6NTQgLTA4MDAKU3ViamVjdDogW1BBVENIXSBSRUdSRVNT SU9OIChTYWZhcmkgMTQtMTYpOiBEdXBsaWNhdGVkIENSLUxGIGluIHRleHRhcmVhIHdpdGgKIHdy YXA9ImhhcmQiIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDk5MjMK IDxyZGFyOi8vcHJvYmxlbS8xMDM4NzA0OTg+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K ClRoaXMgd2FzIGNhdXNlZCBieSBhIHNsaWdodCBjb25mdXNpb24gb2Ygd2hlbiBsZWdhY3kgbGlu ZSBsYXlvdXQgc2V0cyAiZW5kc1dpdGhCcmVhayIgb24gYSBsaW5lLgpXaGlsZSBpbml0aWFsbHkg dGhpcyBiaXQgd2FzIGludHJvZHVjZWQgZm9yIDxicj4gKHByZXZpb3VzTGluZUJyb2tlQXRCUiks IG92ZXIgdGltZSBpdAp0dXJuZWQgaW50byBhICJhbnkgdHlwZSBvZiBsaW5lIGJyZWFrIiBiaXQu CnNraXBUb05leHRTb2Z0TGluZUJyZWFrUG9zaXRpb24gbm93IGNoZWNrcyBmb3IgImFueSBsaW5l IGJyZWFrIiBhbmQgYWxzbyBpZ25vcmVzIHRoZSBsYXN0IGxpbmUuCgoqIFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuY3BwOgooV2ViQ29yZTo6SFRNTFRleHRG b3JtQ29udHJvbEVsZW1lbnQ6OnZhbHVlV2l0aEhhcmRMaW5lQnJlYWtzIGNvbnN0KToKLS0tCiAu Li4vaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHAgICAgICAgfCAzMSArKysrKysr KystLS0tLS0tLS0tCiAuLi5yZC1pbmNvcnJlY3Qtc3VibWl0LWZvcm0tZGF0YS1leHBlY3RlZC50 eHQgfCAgMyArKwogLi4uL3dyYXAtaGFyZC1pbmNvcnJlY3Qtc3VibWl0LWZvcm0tZGF0YS5odG1s IHwgMjYgKysrKysrKysrKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCsp LCAxNiBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9mYXN0L2Zv cm1zL3dyYXAtaGFyZC1pbmNvcnJlY3Qtc3VibWl0LWZvcm0tZGF0YS1leHBlY3RlZC50eHQKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3dyYXAtaGFyZC1pbmNvcnJl Y3Qtc3VibWl0LWZvcm0tZGF0YS5odG1sCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmNwcAppbmRleCA0N2EyNzViN2NlOGMuLjkzNDA4NDJm MzNlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9s RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9s RWxlbWVudC5jcHAKQEAgLTc0MiwyNyArNzQyLDI2IEBAIFN0cmluZyBIVE1MVGV4dEZvcm1Db250 cm9sRWxlbWVudDo6dmFsdWVXaXRoSGFyZExpbmVCcmVha3MoKSBjb25zdAogICAgIGlmICghcmVu ZGVyZXIpCiAgICAgICAgIHJldHVybiB2YWx1ZSgpOwogCi0gICAgTm9kZSogc29mdExpbmVCcmVh a05vZGUgPSBudWxscHRyOwotICAgIHVuc2lnbmVkIHNvZnRMaW5lQnJlYWtPZmZzZXQgPSAwOwor ICAgIE5vZGUqIGJyZWFrTm9kZSA9IG51bGxwdHI7CisgICAgdW5zaWduZWQgYnJlYWtPZmZzZXQg PSAwOwogICAgIGF1dG8gY3VycmVudExpbmVCb3ggPSBJbmxpbmVJdGVyYXRvcjo6Zmlyc3RMaW5l Qm94Rm9yKCpyZW5kZXJlcik7CiAgICAgaWYgKCFjdXJyZW50TGluZUJveCkKICAgICAgICAgcmV0 dXJuIHZhbHVlKCk7CiAKICAgICBhdXRvIHNraXBUb05leHRTb2Z0TGluZUJyZWFrUG9zaXRpb24g PSBbJl0gewotICAgICAgICBmb3IgKDsgY3VycmVudExpbmVCb3g7IGN1cnJlbnRMaW5lQm94LnRy YXZlcnNlTmV4dCgpKSB7CisgICAgICAgIHdoaWxlIChjdXJyZW50TGluZUJveCkgewogICAgICAg ICAgICAgYXV0byBsYXN0UnVuID0gY3VycmVudExpbmVCb3gtPmxhc3RMZWFmQm94KCk7CiAgICAg ICAgICAgICBBU1NFUlQobGFzdFJ1bik7Ci0gICAgICAgICAgICBhdXRvJiByZW5kZXJlciA9IGxh c3RSdW4tPnJlbmRlcmVyKCk7Ci0gICAgICAgICAgICBhdXRvIGxpbmVFbmRzV2l0aEJSID0gaXM8 UmVuZGVyTGluZUJyZWFrPihyZW5kZXJlcikgJiYgIWRvd25jYXN0PFJlbmRlckxpbmVCcmVhaz4o cmVuZGVyZXIpLmlzV0JSKCk7Ci0gICAgICAgICAgICBpZiAoIWxpbmVFbmRzV2l0aEJSKSB7Ci0g ICAgICAgICAgICAgICAgc29mdExpbmVCcmVha05vZGUgPSByZW5kZXJlci5ub2RlKCk7Ci0gICAg ICAgICAgICAgICAgc29mdExpbmVCcmVha09mZnNldCA9IGxhc3RSdW4tPm1heGltdW1DYXJldE9m ZnNldCgpOwotICAgICAgICAgICAgICAgIGN1cnJlbnRMaW5lQm94LnRyYXZlcnNlTmV4dCgpOwor ICAgICAgICAgICAgLy8gU2tpcCBsYXN0IGxpbmUuCisgICAgICAgICAgICBjdXJyZW50TGluZUJv eC50cmF2ZXJzZU5leHQoKTsKKyAgICAgICAgICAgIGlmIChjdXJyZW50TGluZUJveCAmJiAhbGFz dFJ1bi0+aXNMaW5lQnJlYWsoKSkgeworICAgICAgICAgICAgICAgIGJyZWFrTm9kZSA9IGxhc3RS dW4tPnJlbmRlcmVyKCkubm9kZSgpOworICAgICAgICAgICAgICAgIGJyZWFrT2Zmc2V0ID0gbGFz dFJ1bi0+bWF4aW11bUNhcmV0T2Zmc2V0KCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIHNvZnRMaW5lQnJlYWtOb2RlID0gbnVsbHB0 cjsKLSAgICAgICAgc29mdExpbmVCcmVha09mZnNldCA9IDA7CisgICAgICAgIGJyZWFrTm9kZSA9 IG51bGxwdHI7CisgICAgICAgIGJyZWFrT2Zmc2V0ID0gMDsKICAgICB9OwogCiAgICAgc2tpcFRv TmV4dFNvZnRMaW5lQnJlYWtQb3NpdGlvbigpOwpAQCAtNzc1LDE3ICs3NzQsMTcgQEAgU3RyaW5n IEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50Ojp2YWx1ZVdpdGhIYXJkTGluZUJyZWFrcygpIGNv bnN0CiAgICAgICAgICAgICBTdHJpbmcgZGF0YSA9IGRvd25jYXN0PFRleHQ+KCpub2RlKS5kYXRh KCk7CiAgICAgICAgICAgICB1bnNpZ25lZCBsZW5ndGggPSBkYXRhLmxlbmd0aCgpOwogICAgICAg ICAgICAgdW5zaWduZWQgcG9zaXRpb24gPSAwOwotICAgICAgICAgICAgd2hpbGUgKHNvZnRMaW5l QnJlYWtOb2RlID09IG5vZGUgJiYgc29mdExpbmVCcmVha09mZnNldCA8PSBsZW5ndGgpIHsKLSAg ICAgICAgICAgICAgICBpZiAoc29mdExpbmVCcmVha09mZnNldCA+IHBvc2l0aW9uKSB7Ci0gICAg ICAgICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmRTdWJzdHJpbmcoZGF0YSwgcG9zaXRpb24sIHNv ZnRMaW5lQnJlYWtPZmZzZXQgLSBwb3NpdGlvbik7Ci0gICAgICAgICAgICAgICAgICAgIHBvc2l0 aW9uID0gc29mdExpbmVCcmVha09mZnNldDsKKyAgICAgICAgICAgIHdoaWxlIChicmVha05vZGUg PT0gbm9kZSAmJiBicmVha09mZnNldCA8PSBsZW5ndGgpIHsKKyAgICAgICAgICAgICAgICBpZiAo YnJlYWtPZmZzZXQgPiBwb3NpdGlvbikgeworICAgICAgICAgICAgICAgICAgICByZXN1bHQuYXBw ZW5kU3Vic3RyaW5nKGRhdGEsIHBvc2l0aW9uLCBicmVha09mZnNldCAtIHBvc2l0aW9uKTsKKyAg ICAgICAgICAgICAgICAgICAgcG9zaXRpb24gPSBicmVha09mZnNldDsKICAgICAgICAgICAgICAg ICAgICAgcmVzdWx0LmFwcGVuZChuZXdsaW5lQ2hhcmFjdGVyKTsKICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgc2tpcFRvTmV4dFNvZnRMaW5lQnJlYWtQb3NpdGlvbigpOwogICAg ICAgICAgICAgfQogICAgICAgICAgICAgcmVzdWx0LmFwcGVuZFN1YnN0cmluZyhkYXRhLCBwb3Np dGlvbiwgbGVuZ3RoIC0gcG9zaXRpb24pOwogICAgICAgICB9Ci0gICAgICAgIHdoaWxlIChzb2Z0 TGluZUJyZWFrTm9kZSA9PSBub2RlKQorICAgICAgICB3aGlsZSAoYnJlYWtOb2RlID09IG5vZGUp CiAgICAgICAgICAgICBza2lwVG9OZXh0U29mdExpbmVCcmVha1Bvc2l0aW9uKCk7CiAgICAgfQog ICAgIHN0cmlwVHJhaWxpbmdOZXdsaW5lKHJlc3VsdCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2Zvcm1zL3dyYXAtaGFyZC1pbmNvcnJlY3Qtc3VibWl0LWZvcm0tZGF0YS1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3dyYXAtaGFyZC1pbmNvcnJlY3Qtc3VibWl0 LWZvcm0tZGF0YS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwLi43MjA4NmY4ZmU4NzEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2Zvcm1zL3dyYXAtaGFyZC1pbmNvcnJlY3Qtc3VibWl0LWZvcm0tZGF0YS1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwzIEBACitQQVNTIGlmIHRoZXJlJ3Mgbm8gZXh0cmEgbGluZSBiZXR3ZWVuIHRo aXMKK2FuZCB0aGlzLgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3dyYXAt aGFyZC1pbmNvcnJlY3Qtc3VibWl0LWZvcm0tZGF0YS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9m b3Jtcy93cmFwLWhhcmQtaW5jb3JyZWN0LXN1Ym1pdC1mb3JtLWRhdGEuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjUxODk1NDQ1NDQzMgotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvd3JhcC1oYXJkLWluY29ycmVjdC1zdWJtaXQt Zm9ybS1kYXRhLmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPCEtLSBoaXQgc3VibWl0IGJ1dHRvbiBm b3IgbWFudWFsIHRlc3RpbmcgLS0+Cis8Zm9ybSBpZD1zdWJtaXRfdGhpcyBhY3Rpb249IiMiPgor ICA8dGV4dGFyZWEgY29scz0iNTAiIG5hbWU9InR4dCIgd3JhcD0iaGFyZCI+CitQQVNTIGlmIHRo ZXJlJ3Mgbm8gZXh0cmEgbGluZSBiZXR3ZWVuIHRoaXMKK2FuZCB0aGlzLgorICA8L3RleHRhcmVh PgorICA8aW5wdXQgaWQ9c3VibWl0X2J1dHRvbiB0eXBlPSJzdWJtaXQiPgorPC9mb3JtPgorPHBy ZSBpZD1yZXN1bHQ+PC9wcmU+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICB0 ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKworCitkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdmb3Jt JykuYWRkRXZlbnRMaXN0ZW5lcignc3VibWl0JywgKGUpID0+IHsKKyAgZS5wcmV2ZW50RGVmYXVs dCgpOworCisgIGNvbnN0IGZvcm1EYXRhID0gbmV3IEZvcm1EYXRhKGUudGFyZ2V0KTsKKyAgcmVz dWx0LmlubmVyVGV4dCA9IGZvcm1EYXRhLmdldCgndHh0Jyk7CisKKyAgc3VibWl0X3RoaXMuc3R5 bGUuZGlzcGxheSA9ICJub25lIjsKK30pOworCitzdWJtaXRfYnV0dG9uLmNsaWNrKCk7CisKKzwv c2NyaXB0Pgo=