303712 2025-12-07 14:41:39 -0800 [blocks-in-inline] Call hasContentfulInlineLine() instead of hasLines() on a blocks when applicable 2025-12-07 17:38:12 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan webkit-bug-importer oldest_to_newest 2163984 0 zalan 2025-12-07 14:41:39 -0800 ssia 2163985 1 477657 zalan 2025-12-07 14:46:29 -0800 Created attachment 477657 Patch 2163986 2 477658 zalan 2025-12-07 15:16:15 -0800 Created attachment 477658 [fast-cq]Patch 2164013 3 ews-feeder 2025-12-07 17:37:18 -0800 Committed 304078@main (aeb4e26c71b1): <https://commits.webkit.org/304078@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 477658. 2164014 4 webkit-bug-importer 2025-12-07 17:38:12 -0800 <rdar://problem/166028027> 477657 2025-12-07 14:46:29 -0800 2025-12-07 15:16:14 -0800 Patch bug-303712-20251207144629.patch text/plain 9499 zalan RnJvbSA5Y2VkNzMwOTgyNDkzNTRkZGVlMTlkYTEzMmFiNGZjMDRlNWMwY2RmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgNyBEZWMgMjAyNSAxNDo0MjoyNyAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtibG9ja3Mt aW4taW5saW5lXSBDYWxsIGhhc0NvbnRlbnRmdWxJbmxpbmVMaW5lKCkgaW5zdGVhZCBvZgogaGFz TGluZXMoKSBvbiBhIGJsb2NrcyB3aGVuIGFwcGxpY2FibGUKIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMDM3MTIKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoK VGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgcmVtb3ZpbmcgUmVuZGVyQmxvY2tGbG93OjpoYXNM aW5lcygpLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91 dEludGVncmF0aW9uSW5saW5lQ29udGVudC5jcHA6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlv bjo6SW5saW5lQ29udGVudDo6aGFzQ29udGVudGZ1bElubGluZUxldmVsQm94IGNvbnN0KToKKiBT b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9u SW5saW5lQ29udGVudC5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxp bmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcDoKKFdlYkNvcmU6OkxheW91dEludGVn cmF0aW9uOjpMaW5lTGF5b3V0OjpoYXNDb250ZW50ZnVsSW5saW5lTGluZSBjb25zdCk6CiogU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxp bmVMYXlvdXQuaDoKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNw cDoKKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6Zmlyc3RMaW5lQmFzZWxpbmUgY29uc3QpOgoo V2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpsYXN0TGluZUJhc2VsaW5lIGNvbnN0KToKKFdlYkNv cmU6OlJlbmRlckJsb2NrRmxvdzo6aGFzQ29udGVudGZ1bElubGluZUxpbmUgY29uc3QpOgoqIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaDoKKiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcDoKKFdlYkNvcmU6OmJs b2NrQ29udGFpbmVyRm9yTGFzdEZvcm1hdHRlZExpbmUpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9UZXh0Qm94UGFpbnRlci5jcHA6CihXZWJDb3JlOjplbXBoYXNpc01hcmtFeGlzdHNBbmRJ c0Fib3ZlKToKLS0tCiAuLi4vaW5saW5lL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5j cHAgfCAgOSArKysrKysrKysKIC4uLi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250 ZW50LmggICB8ICAxICsKIC4uLi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNw cCAgICB8ICA1ICsrKysrCiAuLi4vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5o ICAgICAgfCAgMSArCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNw cCAgfCAxOSArKysrKysrKysrKy0tLS0tLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tGbG93LmggICAgfCAgMSArCiAuLi4vcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRG bGV4aWJsZUJveC5jcHAgfCAgMiArLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQ YWludGVyLmNwcCAgIHwgIDIgKy0KIDggZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwg MTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGlu ZUNvbnRlbnQuY3BwCmluZGV4IGNkNWY5MmJmZDQ4ZC4uM2JjMWEwM2MwZmExIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0 aW9uSW5saW5lQ29udGVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuY3BwCkBAIC01MCw2ICs1 MCwxNSBAQCBib29sIElubGluZUNvbnRlbnQ6Omhhc0NvbnRlbnRmdWxJbkZsb3dCb3goKSBjb25z dAogICAgIHJldHVybiBmYWxzZTsKIH0KIAorYm9vbCBJbmxpbmVDb250ZW50OjpoYXNDb250ZW50 ZnVsSW5saW5lTGV2ZWxCb3goKSBjb25zdAoreworICAgIGZvciAoYXV0byYgbGluZSA6IG1fZGlz cGxheUNvbnRlbnQubGluZXMpIHsKKyAgICAgICAgaWYgKGxpbmUuaGFzQ29udGVudGZ1bElubGlu ZUxldmVsQm94KCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJu IGZhbHNlOworfQorCiBJdGVyYXRvclJhbmdlPGNvbnN0IElubGluZURpc3BsYXk6OkJveCo+IElu bGluZUNvbnRlbnQ6OmJveGVzRm9yUmVjdChjb25zdCBMYXlvdXRSZWN0JiByZWN0KSBjb25zdAog ewogICAgIGlmIChtX2Rpc3BsYXlDb250ZW50LmJveGVzLmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRp b25JbmxpbmVDb250ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5s aW5lL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5oCmluZGV4IDlhNmVmMzQ5Mzk1OC4u NDg5MDc2MmRjOTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vaW5saW5lL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVD b250ZW50LmgKQEAgLTcwLDYgKzcwLDcgQEAgcHVibGljOgogICAgIElubGluZURpc3BsYXk6OkNv bnRlbnQmIGRpc3BsYXlDb250ZW50KCkgeyByZXR1cm4gbV9kaXNwbGF5Q29udGVudDsgfQogICAg IGNvbnN0IElubGluZURpc3BsYXk6OkNvbnRlbnQmIGRpc3BsYXlDb250ZW50KCkgY29uc3QgeyBy ZXR1cm4gbV9kaXNwbGF5Q29udGVudDsgfQogICAgIGJvb2wgaGFzQ29udGVudGZ1bEluRmxvd0Jv eCgpIGNvbnN0OworICAgIGJvb2wgaGFzQ29udGVudGZ1bElubGluZUxldmVsQm94KCkgY29uc3Q7 CiAKICAgICBGbG9hdFJlY3Qgc2Nyb2xsYWJsZU92ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gbV9z Y3JvbGxhYmxlT3ZlcmZsb3c7IH0KICAgICBGbG9hdFJlY3QgaW5rT3ZlcmZsb3coKSBjb25zdCB7 IHJldHVybiBtX2lua092ZXJmbG93OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9u TGluZUxheW91dC5jcHAKaW5kZXggYTQ0ZThlYWZiMjAwLi5hZjlkNmJhYjk3NWMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdy YXRpb25MaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKQEAgLTg1Miw2ICs4NTIs MTEgQEAgYm9vbCBMaW5lTGF5b3V0OjpoYXNDb250ZW50ZnVsSW5saW5lT3JCbG9ja0xpbmUoKSBj b25zdAogICAgIHJldHVybiBtX2lubGluZUNvbnRlbnQgJiYgbV9pbmxpbmVDb250ZW50LT5oYXND b250ZW50ZnVsSW5GbG93Qm94KCk7CiB9CiAKK2Jvb2wgTGluZUxheW91dDo6aGFzQ29udGVudGZ1 bElubGluZUxpbmUoKSBjb25zdAoreworICAgIHJldHVybiBtX2lubGluZUNvbnRlbnQgJiYgbV9p bmxpbmVDb250ZW50LT5oYXNDb250ZW50ZnVsSW5saW5lTGV2ZWxCb3goKTsKK30KKwogc2l6ZV90 IExpbmVMYXlvdXQ6OmxpbmVDb3VudCgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2lubGluZUNvbnRl bnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5l L0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaAppbmRleCBkMGY0 ZjA2YTgyNWUuLmIxMjk4ZTBmNjlhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9u TGluZUxheW91dC5oCkBAIC0xMTEsNiArMTExLDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNQYWdp bmF0ZWQoKSBjb25zdDsKICAgICBzaXplX3QgbGluZUNvdW50KCkgY29uc3Q7CiAgICAgYm9vbCBo YXNDb250ZW50ZnVsSW5saW5lT3JCbG9ja0xpbmUoKSBjb25zdDsKKyAgICBib29sIGhhc0NvbnRl bnRmdWxJbmxpbmVMaW5lKCkgY29uc3Q7CiAgICAgYm9vbCBpc1NlbGZDb2xsYXBzaW5nQ29udGVu dCgpIGNvbnN0OwogICAgIGJvb2wgaGFzSW5rT3ZlcmZsb3coKSBjb25zdDsKICAgICBMYXlvdXRV bml0IGZpcnN0TGluZUJhc2VsaW5lKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IDNlNzdiMGM5M2E4Ny4uZDkxYmUyOGQ0NWNmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMzMx Niw3ICszMzE2LDkgQEAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJCbG9ja0Zsb3c6 OmZpcnN0TGluZUJhc2VsaW5lKCkgY29uc3QKICAgICBpZiAoIWNoaWxkcmVuSW5saW5lKCkpCiAg ICAgICAgIHJldHVybiBSZW5kZXJCbG9jazo6Zmlyc3RMaW5lQmFzZWxpbmUoKTsKIAotICAgIGlm ICghaGFzTGluZXMoKSkgeworICAgIGlmIChhdXRvKiBsaW5lTGF5b3V0ID0gdGhpcy0+aW5saW5l TGF5b3V0KCkpIHsKKyAgICAgICAgaWYgKGxpbmVMYXlvdXQtPmhhc0NvbnRlbnRmdWxJbmxpbmVM aW5lKCkpCisgICAgICAgICAgICByZXR1cm4gTGF5b3V0VW5pdCB7IGZsb29yVG9JbnQobGluZUxh eW91dC0+Zmlyc3RMaW5lQmFzZWxpbmUoKSkgfTsKICAgICAgICAgaWYgKGhhc0xpbmVJZkVtcHR5 KCkpIHsKICAgICAgICAgICAgIGF1dG8mIGZvbnRNZXRyaWNzID0gZmlyc3RMaW5lU3R5bGUoKS5t ZXRyaWNzT2ZQcmltYXJ5Rm9udCgpOwogICAgICAgICAgICAgcmV0dXJuIHsgTGF5b3V0VW5pdChi b3JkZXJBbmRQYWRkaW5nQmVmb3JlKCkgKyBmb250TWV0cmljcy5pbnRBc2NlbnQoKSArIChmaXJz dExpbmVTdHlsZSgpLmNvbXB1dGVkTGluZUhlaWdodCgpIC0gZm9udE1ldHJpY3MuaW50SGVpZ2h0 KCkpIC8gMikgfTsKQEAgLTMzMjQsOSArMzMyNiw2IEBAIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5p dD4gUmVuZGVyQmxvY2tGbG93OjpmaXJzdExpbmVCYXNlbGluZSgpIGNvbnN0CiAgICAgICAgIHJl dHVybiB7IH07CiAgICAgfQogCi0gICAgaWYgKGF1dG8qIGxpbmVMYXlvdXQgPSB0aGlzLT5pbmxp bmVMYXlvdXQoKSkKLSAgICAgICAgcmV0dXJuIExheW91dFVuaXQgeyBmbG9vclRvSW50KGxpbmVM YXlvdXQtPmZpcnN0TGluZUJhc2VsaW5lKCkpIH07Ci0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKICAgICByZXR1cm4geyB9OwogfQpAQCAtMzM0Miw3ICszMzQxLDkgQEAgc3RkOjpvcHRpb25h bDxMYXlvdXRVbml0PiBSZW5kZXJCbG9ja0Zsb3c6Omxhc3RMaW5lQmFzZWxpbmUoKSBjb25zdAog ICAgIGlmICghY2hpbGRyZW5JbmxpbmUoKSkKICAgICAgICAgcmV0dXJuIFJlbmRlckJsb2NrOjps YXN0TGluZUJhc2VsaW5lKCk7CiAKLSAgICBpZiAoIWhhc0xpbmVzKCkpIHsKKyAgICBpZiAoYXV0 byogbGluZUxheW91dCA9IHRoaXMtPmlubGluZUxheW91dCgpKSB7CisgICAgICAgIGlmIChsaW5l TGF5b3V0LT5oYXNDb250ZW50ZnVsSW5saW5lTGluZSgpKQorICAgICAgICAgICAgcmV0dXJuIExh eW91dFVuaXQgeyBmbG9vclRvSW50KGxpbmVMYXlvdXQtPmxhc3RMaW5lQmFzZWxpbmUoKSkgfTsK ICAgICAgICAgaWYgKGhhc0xpbmVJZkVtcHR5KCkpIHsKICAgICAgICAgICAgIGF1dG8mIGZvbnRN ZXRyaWNzID0gc3R5bGUoKS5tZXRyaWNzT2ZQcmltYXJ5Rm9udCgpOwogICAgICAgICAgICAgcmV0 dXJuIHsgTGF5b3V0VW5pdChib3JkZXJBbmRQYWRkaW5nQmVmb3JlKCkgKyBmb250TWV0cmljcy5p bnRBc2NlbnQoKSArIChzdHlsZSgpLmNvbXB1dGVkTGluZUhlaWdodCgpIC0gZm9udE1ldHJpY3Mu aW50SGVpZ2h0KCkpIC8gMikgfTsKQEAgLTMzNTAsOSArMzM1MSw2IEBAIHN0ZDo6b3B0aW9uYWw8 TGF5b3V0VW5pdD4gUmVuZGVyQmxvY2tGbG93OjpsYXN0TGluZUJhc2VsaW5lKCkgY29uc3QKICAg ICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKLSAgICBpZiAoYXV0byogbGluZUxheW91dCA9IGlu bGluZUxheW91dCgpKQotICAgICAgICByZXR1cm4gTGF5b3V0VW5pdCB7IGZsb29yVG9JbnQobGlu ZUxheW91dC0+bGFzdExpbmVCYXNlbGluZSgpKSB9OwotCiAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CiAgICAgcmV0dXJuIHsgfTsKIH0KQEAgLTM4NTUsNiArMzg1MywxMSBAQCBib29sIFJlbmRl ckJsb2NrRmxvdzo6aGFzQ29udGVudGZ1bElubGluZU9yQmxvY2tMaW5lKCkgY29uc3QKICAgICBy ZXR1cm4gaW5saW5lTGF5b3V0KCkgPyBpbmxpbmVMYXlvdXQoKS0+aGFzQ29udGVudGZ1bElubGlu ZU9yQmxvY2tMaW5lKCkgOiBoYXNMaW5lcygpOwogfQogCitib29sIFJlbmRlckJsb2NrRmxvdzo6 aGFzQ29udGVudGZ1bElubGluZUxpbmUoKSBjb25zdAoreworICAgIHJldHVybiBpbmxpbmVMYXlv dXQoKSA/IGlubGluZUxheW91dCgpLT5oYXNDb250ZW50ZnVsSW5saW5lTGluZSgpIDogZmFsc2U7 Cit9CisKIGJvb2wgUmVuZGVyQmxvY2tGbG93OjpoYXNCbG9ja3NJbklubGluZUxheW91dCgpIGNv bnN0CiB7CiAgICAgYXV0byogaW5saW5lTGF5b3V0ID0gdGhpcy0+aW5saW5lTGF5b3V0KCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKaW5kZXggMGEzMTE3OWY4 NmVjLi5lNTVkMDNmNjYzYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9ja0Zsb3cuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmgKQEAgLTM1Nyw2ICszNTcsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIGhhc0xpbmVz KCkgY29uc3Q7CiAgICAgYm9vbCBoYXNDb250ZW50ZnVsSW5saW5lT3JCbG9ja0xpbmUoKSBjb25z dDsKKyAgICBib29sIGhhc0NvbnRlbnRmdWxJbmxpbmVMaW5lKCkgY29uc3Q7CiAgICAgYm9vbCBo YXNCbG9ja3NJbklubGluZUxheW91dCgpIGNvbnN0OwogCiAgICAgZW51bSBJbnZhbGlkYXRpb25S ZWFzb24gOiB1aW50OF90IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKaW5kZXggNmY3NzY3MGUwZmE0Li45OGFj MWIxYThjZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXBy ZWNhdGVkRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCkBAIC0xMDQ3LDcgKzEwNDcsNyBAQCBzdGF0aWMg UmVuZGVyQmxvY2tGbG93KiBibG9ja0NvbnRhaW5lckZvckxhc3RGb3JtYXR0ZWRMaW5lKGNvbnN0 IFJlbmRlckJsb2NrJiBlbgogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIGlmIChhdXRv KiBkZXNjZW5kYW50Um9vdCA9IGJsb2NrQ29udGFpbmVyRm9yTGFzdEZvcm1hdHRlZExpbmUoKmJs b2NrQ29udGFpbmVyKSkKICAgICAgICAgICAgIHJldHVybiBkZXNjZW5kYW50Um9vdDsKLSAgICAg ICAgaWYgKENoZWNrZWRQdHIgYmxvY2tGbG93ID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlckJsb2Nr Rmxvdz4oYmxvY2tDb250YWluZXIuZ2V0KCkpOyBibG9ja0Zsb3cgJiYgYmxvY2tGbG93LT5oYXNM aW5lcygpKQorICAgICAgICBpZiAoQ2hlY2tlZFB0ciBibG9ja0Zsb3cgPSBkeW5hbWljRG93bmNh c3Q8UmVuZGVyQmxvY2tGbG93PihibG9ja0NvbnRhaW5lci5nZXQoKSk7IGJsb2NrRmxvdyAmJiBi bG9ja0Zsb3ctPmhhc0NvbnRlbnRmdWxJbmxpbmVMaW5lKCkpCiAgICAgICAgICAgICByZXR1cm4g YmxvY2tGbG93LnVuc2FmZUdldCgpOwogICAgIH0KICAgICByZXR1cm4geyB9OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAKaW5kZXggNjI3NTU1NzE5NzY2Li42 ZWNlYmJkZjFkYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94 UGFpbnRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVy LmNwcApAQCAtOTAsNyArOTAsNyBAQCBzdGF0aWMgc3RkOjpvcHRpb25hbDxib29sPiBlbXBoYXNp c01hcmtFeGlzdHNBbmRJc0Fib3ZlKGNvbnN0IFJlbmRlclRleHQmIHJlbmRlcgogCiAgICAgaWYg KGF1dG8qIGFubm90YXRpb24gPSBmaW5kUnVieUFubm90YXRpb24oKSkgewogICAgICAgICAvLyBU aGUgZW1waGFzaXMgbWFya3MgYXJlIHN1cHByZXNzZWQgb25seSBpZiB0aGVyZSBpcyBhIHJ1Ynkg YW5ub3RhdGlvbiBib3ggb24gdGhlIHNhbWUgc2lkZSBhbmQgaXQgaXMgbm90IGVtcHR5LgotICAg ICAgICBpZiAoYW5ub3RhdGlvbi0+aGFzTGluZXMoKSAmJiBpc0Fib3ZlID09IChhbm5vdGF0aW9u LT5zdHlsZSgpLnJ1YnlQb3NpdGlvbigpID09IFJ1YnlQb3NpdGlvbjo6T3ZlcikpCisgICAgICAg IGlmIChhbm5vdGF0aW9uLT5oYXNDb250ZW50ZnVsSW5saW5lTGluZSgpICYmIGlzQWJvdmUgPT0g KGFubm90YXRpb24tPnN0eWxlKCkucnVieVBvc2l0aW9uKCkgPT0gUnVieVBvc2l0aW9uOjpPdmVy KSkKICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQogCg== 477658 2025-12-07 15:16:15 -0800 2025-12-07 17:37:19 -0800 [fast-cq]Patch bug-303712-20251207151614.patch text/plain 9691 zalan RnJvbSBlNWVjMDY0YWE0NzdlY2IzZDUwN2I0MTFiODk1ZmY0ZWY2MjJjM2YwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgNyBEZWMgMjAyNSAxNDo0MjoyNyAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtibG9ja3Mt aW4taW5saW5lXSBDYWxsIGhhc0NvbnRlbnRmdWxJbmxpbmVMaW5lKCkgaW5zdGVhZCBvZgogaGFz TGluZXMoKSBvbiBhIGJsb2NrcyB3aGVuIGFwcGxpY2FibGUKIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMDM3MTIKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoK VGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgcmVtb3ZpbmcgUmVuZGVyQmxvY2tGbG93OjpoYXNM aW5lcygpLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91 dEludGVncmF0aW9uSW5saW5lQ29udGVudC5jcHA6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlv bjo6SW5saW5lQ29udGVudDo6aGFzQ29udGVudGZ1bElubGluZUxldmVsQm94IGNvbnN0KToKKiBT b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9u SW5saW5lQ29udGVudC5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxp bmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcDoKKFdlYkNvcmU6OkxheW91dEludGVn cmF0aW9uOjpMaW5lTGF5b3V0OjpoYXNDb250ZW50ZnVsSW5saW5lTGluZSBjb25zdCk6CiogU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxp bmVMYXlvdXQuaDoKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNw cDoKKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6Zmlyc3RMaW5lQmFzZWxpbmUgY29uc3QpOgoo V2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpsYXN0TGluZUJhc2VsaW5lIGNvbnN0KToKKFdlYkNv cmU6OlJlbmRlckJsb2NrRmxvdzo6aGFzQ29udGVudGZ1bElubGluZUxpbmUgY29uc3QpOgoqIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaDoKKiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcDoKKFdlYkNvcmU6OmJs b2NrQ29udGFpbmVyRm9yTGFzdEZvcm1hdHRlZExpbmUpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9UZXh0Qm94UGFpbnRlci5jcHA6CihXZWJDb3JlOjplbXBoYXNpc01hcmtFeGlzdHNBbmRJ c0Fib3ZlKToKLS0tCiAuLi4vaW5saW5lL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5j cHAgfCAgOSArKysrKwogLi4uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQu aCAgIHwgIDEgKwogLi4uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwICAg IHwgIDUgKysrCiAuLi4vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5oICAgICAg fCAgMSArCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCAgfCAz NyArKysrKysrKystLS0tLS0tLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmggICAgfCAgMSArCiAuLi4vcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJs ZUJveC5jcHAgfCAgMiArLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVy LmNwcCAgIHwgIDIgKy0KIDggZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMjIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRl bnQuY3BwCmluZGV4IGNkNWY5MmJmZDQ4ZC4uM2JjMWEwM2MwZmExIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uSW5s aW5lQ29udGVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lu bGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuY3BwCkBAIC01MCw2ICs1MCwxNSBA QCBib29sIElubGluZUNvbnRlbnQ6Omhhc0NvbnRlbnRmdWxJbkZsb3dCb3goKSBjb25zdAogICAg IHJldHVybiBmYWxzZTsKIH0KIAorYm9vbCBJbmxpbmVDb250ZW50OjpoYXNDb250ZW50ZnVsSW5s aW5lTGV2ZWxCb3goKSBjb25zdAoreworICAgIGZvciAoYXV0byYgbGluZSA6IG1fZGlzcGxheUNv bnRlbnQubGluZXMpIHsKKyAgICAgICAgaWYgKGxpbmUuaGFzQ29udGVudGZ1bElubGluZUxldmVs Qm94KCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNl OworfQorCiBJdGVyYXRvclJhbmdlPGNvbnN0IElubGluZURpc3BsYXk6OkJveCo+IElubGluZUNv bnRlbnQ6OmJveGVzRm9yUmVjdChjb25zdCBMYXlvdXRSZWN0JiByZWN0KSBjb25zdAogewogICAg IGlmIChtX2Rpc3BsYXlDb250ZW50LmJveGVzLmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Jbmxp bmVDb250ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xh eW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5oCmluZGV4IDlhNmVmMzQ5Mzk1OC4uNDg5MDc2 MmRjOTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5s aW5lL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50 LmgKQEAgLTcwLDYgKzcwLDcgQEAgcHVibGljOgogICAgIElubGluZURpc3BsYXk6OkNvbnRlbnQm IGRpc3BsYXlDb250ZW50KCkgeyByZXR1cm4gbV9kaXNwbGF5Q29udGVudDsgfQogICAgIGNvbnN0 IElubGluZURpc3BsYXk6OkNvbnRlbnQmIGRpc3BsYXlDb250ZW50KCkgY29uc3QgeyByZXR1cm4g bV9kaXNwbGF5Q29udGVudDsgfQogICAgIGJvb2wgaGFzQ29udGVudGZ1bEluRmxvd0JveCgpIGNv bnN0OworICAgIGJvb2wgaGFzQ29udGVudGZ1bElubGluZUxldmVsQm94KCkgY29uc3Q7CiAKICAg ICBGbG9hdFJlY3Qgc2Nyb2xsYWJsZU92ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxh YmxlT3ZlcmZsb3c7IH0KICAgICBGbG9hdFJlY3QgaW5rT3ZlcmZsb3coKSBjb25zdCB7IHJldHVy biBtX2lua092ZXJmbG93OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxh eW91dC5jcHAKaW5kZXggYTQ0ZThlYWZiMjAwLi5hZjlkNmJhYjk3NWMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25M aW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5s aW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKQEAgLTg1Miw2ICs4NTIsMTEgQEAg Ym9vbCBMaW5lTGF5b3V0OjpoYXNDb250ZW50ZnVsSW5saW5lT3JCbG9ja0xpbmUoKSBjb25zdAog ICAgIHJldHVybiBtX2lubGluZUNvbnRlbnQgJiYgbV9pbmxpbmVDb250ZW50LT5oYXNDb250ZW50 ZnVsSW5GbG93Qm94KCk7CiB9CiAKK2Jvb2wgTGluZUxheW91dDo6aGFzQ29udGVudGZ1bElubGlu ZUxpbmUoKSBjb25zdAoreworICAgIHJldHVybiBtX2lubGluZUNvbnRlbnQgJiYgbV9pbmxpbmVD b250ZW50LT5oYXNDb250ZW50ZnVsSW5saW5lTGV2ZWxCb3goKTsKK30KKwogc2l6ZV90IExpbmVM YXlvdXQ6OmxpbmVDb3VudCgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2lubGluZUNvbnRlbnQpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91 dEludGVncmF0aW9uTGluZUxheW91dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaAppbmRleCBkMGY0ZjA2YTgy NWUuLmIxMjk4ZTBmNjlhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxh eW91dC5oCkBAIC0xMTEsNiArMTExLDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNQYWdpbmF0ZWQo KSBjb25zdDsKICAgICBzaXplX3QgbGluZUNvdW50KCkgY29uc3Q7CiAgICAgYm9vbCBoYXNDb250 ZW50ZnVsSW5saW5lT3JCbG9ja0xpbmUoKSBjb25zdDsKKyAgICBib29sIGhhc0NvbnRlbnRmdWxJ bmxpbmVMaW5lKCkgY29uc3Q7CiAgICAgYm9vbCBpc1NlbGZDb2xsYXBzaW5nQ29udGVudCgpIGNv bnN0OwogICAgIGJvb2wgaGFzSW5rT3ZlcmZsb3coKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGZp cnN0TGluZUJhc2VsaW5lKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0Zsb3cuY3BwCmluZGV4IDNlNzdiMGM5M2E4Ny4uODk3YmQwMWUwNmVhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMzMxNiwxOCAr MzMxNiwxNCBAQCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckJsb2NrRmxvdzo6Zmly c3RMaW5lQmFzZWxpbmUoKSBjb25zdAogICAgIGlmICghY2hpbGRyZW5JbmxpbmUoKSkKICAgICAg ICAgcmV0dXJuIFJlbmRlckJsb2NrOjpmaXJzdExpbmVCYXNlbGluZSgpOwogCi0gICAgaWYgKCFo YXNMaW5lcygpKSB7Ci0gICAgICAgIGlmIChoYXNMaW5lSWZFbXB0eSgpKSB7Ci0gICAgICAgICAg ICBhdXRvJiBmb250TWV0cmljcyA9IGZpcnN0TGluZVN0eWxlKCkubWV0cmljc09mUHJpbWFyeUZv bnQoKTsKLSAgICAgICAgICAgIHJldHVybiB7IExheW91dFVuaXQoYm9yZGVyQW5kUGFkZGluZ0Jl Zm9yZSgpICsgZm9udE1ldHJpY3MuaW50QXNjZW50KCkgKyAoZmlyc3RMaW5lU3R5bGUoKS5jb21w dXRlZExpbmVIZWlnaHQoKSAtIGZvbnRNZXRyaWNzLmludEhlaWdodCgpKSAvIDIpIH07Ci0gICAg ICAgIH0KLSAgICAgICAgcmV0dXJuIHsgfTsKLSAgICB9Ci0KLSAgICBpZiAoYXV0byogbGluZUxh eW91dCA9IHRoaXMtPmlubGluZUxheW91dCgpKQorICAgIGlmIChhdXRvKiBsaW5lTGF5b3V0ID0g dGhpcy0+aW5saW5lTGF5b3V0KCk7IGxpbmVMYXlvdXQgJiYgbGluZUxheW91dC0+aGFzQ29udGVu dGZ1bElubGluZUxpbmUoKSkKICAgICAgICAgcmV0dXJuIExheW91dFVuaXQgeyBmbG9vclRvSW50 KGxpbmVMYXlvdXQtPmZpcnN0TGluZUJhc2VsaW5lKCkpIH07CiAKLSAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKKyAgICBpZiAoaGFzTGluZUlmRW1wdHkoKSkgeworICAgICAgICBhdXRvJiBmb250 TWV0cmljcyA9IGZpcnN0TGluZVN0eWxlKCkubWV0cmljc09mUHJpbWFyeUZvbnQoKTsKKyAgICAg ICAgcmV0dXJuIHsgTGF5b3V0VW5pdChib3JkZXJBbmRQYWRkaW5nQmVmb3JlKCkgKyBmb250TWV0 cmljcy5pbnRBc2NlbnQoKSArIChmaXJzdExpbmVTdHlsZSgpLmNvbXB1dGVkTGluZUhlaWdodCgp IC0gZm9udE1ldHJpY3MuaW50SGVpZ2h0KCkpIC8gMikgfTsKKyAgICB9CisKICAgICByZXR1cm4g eyB9OwogfQogCkBAIC0zMzQyLDE4ICszMzM4LDE0IEBAIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5p dD4gUmVuZGVyQmxvY2tGbG93OjpsYXN0TGluZUJhc2VsaW5lKCkgY29uc3QKICAgICBpZiAoIWNo aWxkcmVuSW5saW5lKCkpCiAgICAgICAgIHJldHVybiBSZW5kZXJCbG9jazo6bGFzdExpbmVCYXNl bGluZSgpOwogCi0gICAgaWYgKCFoYXNMaW5lcygpKSB7Ci0gICAgICAgIGlmIChoYXNMaW5lSWZF bXB0eSgpKSB7Ci0gICAgICAgICAgICBhdXRvJiBmb250TWV0cmljcyA9IHN0eWxlKCkubWV0cmlj c09mUHJpbWFyeUZvbnQoKTsKLSAgICAgICAgICAgIHJldHVybiB7IExheW91dFVuaXQoYm9yZGVy QW5kUGFkZGluZ0JlZm9yZSgpICsgZm9udE1ldHJpY3MuaW50QXNjZW50KCkgKyAoc3R5bGUoKS5j b21wdXRlZExpbmVIZWlnaHQoKSAtIGZvbnRNZXRyaWNzLmludEhlaWdodCgpKSAvIDIpIH07Ci0g ICAgICAgIH0KLSAgICAgICAgcmV0dXJuIHsgfTsKLSAgICB9Ci0KLSAgICBpZiAoYXV0byogbGlu ZUxheW91dCA9IGlubGluZUxheW91dCgpKQorICAgIGlmIChhdXRvKiBsaW5lTGF5b3V0ID0gdGhp cy0+aW5saW5lTGF5b3V0KCk7IGxpbmVMYXlvdXQgJiYgbGluZUxheW91dC0+aGFzQ29udGVudGZ1 bElubGluZUxpbmUoKSkKICAgICAgICAgcmV0dXJuIExheW91dFVuaXQgeyBmbG9vclRvSW50KGxp bmVMYXlvdXQtPmxhc3RMaW5lQmFzZWxpbmUoKSkgfTsKIAotICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOworICAgIGlmIChoYXNMaW5lSWZFbXB0eSgpKSB7CisgICAgICAgIGF1dG8mIGZvbnRNZXRy aWNzID0gc3R5bGUoKS5tZXRyaWNzT2ZQcmltYXJ5Rm9udCgpOworICAgICAgICByZXR1cm4geyBM YXlvdXRVbml0KGJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKSArIGZvbnRNZXRyaWNzLmludEFzY2Vu dCgpICsgKHN0eWxlKCkuY29tcHV0ZWRMaW5lSGVpZ2h0KCkgLSBmb250TWV0cmljcy5pbnRIZWln aHQoKSkgLyAyKSB9OworICAgIH0KKwogICAgIHJldHVybiB7IH07CiB9CiAKQEAgLTM4NTUsNiAr Mzg0NywxMSBAQCBib29sIFJlbmRlckJsb2NrRmxvdzo6aGFzQ29udGVudGZ1bElubGluZU9yQmxv Y2tMaW5lKCkgY29uc3QKICAgICByZXR1cm4gaW5saW5lTGF5b3V0KCkgPyBpbmxpbmVMYXlvdXQo KS0+aGFzQ29udGVudGZ1bElubGluZU9yQmxvY2tMaW5lKCkgOiBoYXNMaW5lcygpOwogfQogCiti b29sIFJlbmRlckJsb2NrRmxvdzo6aGFzQ29udGVudGZ1bElubGluZUxpbmUoKSBjb25zdAorewor ICAgIHJldHVybiBpbmxpbmVMYXlvdXQoKSA/IGlubGluZUxheW91dCgpLT5oYXNDb250ZW50ZnVs SW5saW5lTGluZSgpIDogZmFsc2U7Cit9CisKIGJvb2wgUmVuZGVyQmxvY2tGbG93OjpoYXNCbG9j a3NJbklubGluZUxheW91dCgpIGNvbnN0CiB7CiAgICAgYXV0byogaW5saW5lTGF5b3V0ID0gdGhp cy0+aW5saW5lTGF5b3V0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tGbG93LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93LmgKaW5kZXggMGEzMTE3OWY4NmVjLi5lNTVkMDNmNjYzYTAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKQEAgLTM1Nyw2ICszNTcsNyBAQCBwdWJsaWM6 CiAKICAgICBib29sIGhhc0xpbmVzKCkgY29uc3Q7CiAgICAgYm9vbCBoYXNDb250ZW50ZnVsSW5s aW5lT3JCbG9ja0xpbmUoKSBjb25zdDsKKyAgICBib29sIGhhc0NvbnRlbnRmdWxJbmxpbmVMaW5l KCkgY29uc3Q7CiAgICAgYm9vbCBoYXNCbG9ja3NJbklubGluZUxheW91dCgpIGNvbnN0OwogCiAg ICAgZW51bSBJbnZhbGlkYXRpb25SZWFzb24gOiB1aW50OF90IHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKaW5k ZXggNmY3NzY3MGUwZmE0Li45OGFjMWIxYThjZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCkBAIC0xMDQ3 LDcgKzEwNDcsNyBAQCBzdGF0aWMgUmVuZGVyQmxvY2tGbG93KiBibG9ja0NvbnRhaW5lckZvckxh c3RGb3JtYXR0ZWRMaW5lKGNvbnN0IFJlbmRlckJsb2NrJiBlbgogICAgICAgICAgICAgY29udGlu dWU7CiAgICAgICAgIGlmIChhdXRvKiBkZXNjZW5kYW50Um9vdCA9IGJsb2NrQ29udGFpbmVyRm9y TGFzdEZvcm1hdHRlZExpbmUoKmJsb2NrQ29udGFpbmVyKSkKICAgICAgICAgICAgIHJldHVybiBk ZXNjZW5kYW50Um9vdDsKLSAgICAgICAgaWYgKENoZWNrZWRQdHIgYmxvY2tGbG93ID0gZHluYW1p Y0Rvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oYmxvY2tDb250YWluZXIuZ2V0KCkpOyBibG9ja0Zs b3cgJiYgYmxvY2tGbG93LT5oYXNMaW5lcygpKQorICAgICAgICBpZiAoQ2hlY2tlZFB0ciBibG9j a0Zsb3cgPSBkeW5hbWljRG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93PihibG9ja0NvbnRhaW5lci5n ZXQoKSk7IGJsb2NrRmxvdyAmJiBibG9ja0Zsb3ctPmhhc0NvbnRlbnRmdWxJbmxpbmVMaW5lKCkp CiAgICAgICAgICAgICByZXR1cm4gYmxvY2tGbG93LnVuc2FmZUdldCgpOwogICAgIH0KICAgICBy ZXR1cm4geyB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQ YWludGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAK aW5kZXggNjI3NTU1NzE5NzY2Li42ZWNlYmJkZjFkYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcApAQCAtOTAsNyArOTAsNyBAQCBzdGF0aWMgc3RkOjpv cHRpb25hbDxib29sPiBlbXBoYXNpc01hcmtFeGlzdHNBbmRJc0Fib3ZlKGNvbnN0IFJlbmRlclRl eHQmIHJlbmRlcgogCiAgICAgaWYgKGF1dG8qIGFubm90YXRpb24gPSBmaW5kUnVieUFubm90YXRp b24oKSkgewogICAgICAgICAvLyBUaGUgZW1waGFzaXMgbWFya3MgYXJlIHN1cHByZXNzZWQgb25s eSBpZiB0aGVyZSBpcyBhIHJ1YnkgYW5ub3RhdGlvbiBib3ggb24gdGhlIHNhbWUgc2lkZSBhbmQg aXQgaXMgbm90IGVtcHR5LgotICAgICAgICBpZiAoYW5ub3RhdGlvbi0+aGFzTGluZXMoKSAmJiBp c0Fib3ZlID09IChhbm5vdGF0aW9uLT5zdHlsZSgpLnJ1YnlQb3NpdGlvbigpID09IFJ1YnlQb3Np dGlvbjo6T3ZlcikpCisgICAgICAgIGlmIChhbm5vdGF0aW9uLT5oYXNDb250ZW50ZnVsSW5saW5l TGluZSgpICYmIGlzQWJvdmUgPT0gKGFubm90YXRpb24tPnN0eWxlKCkucnVieVBvc2l0aW9uKCkg PT0gUnVieVBvc2l0aW9uOjpPdmVyKSkKICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQog Cg==