239059 2022-04-10 21:16:28 -0700 [IFC][Integration] LayoutIntegration::LineLayout should not expose InlineContent 2022-04-11 18:32:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok darin esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1860194 0 zalan 2022-04-10 21:16:28 -0700 ssia 1860195 1 457230 zalan 2022-04-10 21:19:13 -0700 Created attachment 457230 Patch 1860423 2 457230 darin 2022-04-11 14:48:58 -0700 Comment on attachment 457230 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457230&action=review > Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp:497 > + return m_inlineContent ? m_inlineContent->hasVisualOverflow() : false; I like writing these with &&, would you consider that? 1860425 3 zalan 2022-04-11 14:51:57 -0700 (In reply to Darin Adler from comment #2) > Comment on attachment 457230 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=457230&action=review > > > Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp:497 > > + return m_inlineContent ? m_inlineContent->hasVisualOverflow() : false; > > I like writing these with &&, would you consider that? good point! yes! 1860442 4 457295 zalan 2022-04-11 15:49:20 -0700 Created attachment 457295 Patch 1860514 5 ews-feeder 2022-04-11 18:31:21 -0700 Committed r292752 (249536@main): <https://commits.webkit.org/249536@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457295. 1860515 6 webkit-bug-importer 2022-04-11 18:32:15 -0700 <rdar://problem/91601019> 457230 2022-04-10 21:19:13 -0700 2022-04-11 15:54:05 -0700 Patch bug-239059-20220410211913.patch text/plain 9968 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTY1MWQ4Y2RhMTJmNjZj YmM2ZGE4OTEwMzRhY2Q0ZmI1YTRjODlkNy4uMmQwMmVlN2I3Njc2MGNkNDM5ZDczMDk1ZjQzZmE4 OTA4NGNlN2VmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTA0LTEwICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQgc2hvdWxkIG5vdCBleHBvc2UgSW5saW5lQ29u dGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM5 MDU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1w bGVtZW50IGlua092ZXJmbG93VG9wL2lua092ZXJmbG93Qm90dG9tIGZvciBpbmxpbmUgaXRlcmF0 b3IgKExpbmVCb3gpIHNvIHRoYXQgd2UgY2FuCisgICAgICAgIGtlZXAgSW5saW5lQ29udGVudCBp bnRlcm5hbCB0byBMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dC4KKworICAgICAgICAqIGxh eW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVCb3guaDoKKyAgICAgICAgKFdlYkNv cmU6OklubGluZUl0ZXJhdG9yOjpMaW5lQm94OjppbmtPdmVyZmxvd1RvcCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUJveDo6aW5rT3ZlcmZsb3dCb3R0b20g Y29uc3QpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVC b3hMZWdhY3lQYXRoLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUJv eEl0ZXJhdG9yTGVnYWN5UGF0aDo6aW5rT3ZlcmZsb3dUb3AgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVCb3hJdGVyYXRvckxlZ2FjeVBhdGg6Omlua092ZXJm bG93Qm90dG9tIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRl cmF0b3JMaW5lQm94TW9kZXJuUGF0aC5oOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0 b3I6OkxpbmVCb3hJdGVyYXRvck1vZGVyblBhdGg6Omlua092ZXJmbG93VG9wIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lQm94SXRlcmF0b3JNb2Rlcm5QYXRo OjppbmtPdmVyZmxvd0JvdHRvbSBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6aGFzVmlzdWFsT3ZlcmZsb3cgY29uc3QpOgorICAg ICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojppc1BhZ2lu YXRlZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxh eW91dDo6aW5saW5lQ29udGVudCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJsb2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6 OmxheW91dE1vZGVybkxpbmVzKToKKwogMjAyMi0wNC0xMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBsaXN0TWFya2VyVGV4dEZvck5vZGVBbmRQb3Np dGlvbigpIHRvIHJldHVybiBhIFN0cmluZ1ZpZXcgaW5zdGVhZCBvZiBhIFN0cmluZwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGlu ZUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9y TGluZUJveC5oCmluZGV4IDczZDhjOTdkMWIzNDcxMWY4MjhiYmNhNGNhNTI2MGQxOTE2NjdjMmYu LjEwZjk4MzEzODlkZjM1OTRiMmZjZDU2NzEyNmZhN2FhZjVjMDU2MjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVCb3guaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5l Qm94LmgKQEAgLTY3LDYgKzY3LDkgQEAgcHVibGljOgogICAgIGZsb2F0IGNvbnRlbnRMb2dpY2Fs VG9wQWRqdXN0ZWRGb3JQcmVjZWRpbmdMaW5lQm94KCkgY29uc3Q7CiAgICAgZmxvYXQgY29udGVu dExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmVCb3goKSBjb25zdDsKIAorICAg IGZsb2F0IGlua092ZXJmbG93VG9wKCkgY29uc3Q7CisgICAgZmxvYXQgaW5rT3ZlcmZsb3dCb3R0 b20oKSBjb25zdDsKKwogICAgIGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgY29udGFpbmluZ0Jsb2Nr KCkgY29uc3Q7CiAgICAgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGNvbnRhaW5pbmdGcmFnbWVu dCgpIGNvbnN0OwogCkBAIC0xODAsNiArMTgzLDIwIEBAIGlubGluZSBmbG9hdCBMaW5lQm94Ojpi b3R0b20oKSBjb25zdAogICAgIH0pOwogfQogCitpbmxpbmUgZmxvYXQgTGluZUJveDo6aW5rT3Zl cmZsb3dUb3AoKSBjb25zdAoreworICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKG1fcGF0aFZhcmlh bnQsIFtdKGNvbnN0IGF1dG8mIHBhdGgpIHsKKyAgICAgICAgcmV0dXJuIHBhdGguaW5rT3ZlcmZs b3dUb3AoKTsKKyAgICB9KTsKK30KKworaW5saW5lIGZsb2F0IExpbmVCb3g6Omlua092ZXJmbG93 Qm90dG9tKCkgY29uc3QKK3sKKyAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbihtX3BhdGhWYXJpYW50 LCBbXShjb25zdCBhdXRvJiBwYXRoKSB7CisgICAgICAgIHJldHVybiBwYXRoLmlua092ZXJmbG93 Qm90dG9tKCk7CisgICAgfSk7Cit9CisKIGlubGluZSBmbG9hdCBMaW5lQm94Ojpjb250ZW50TG9n aWNhbExlZnQoKSBjb25zdAogewogICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKG1fcGF0aFZhcmlh bnQsIFtdKGNvbnN0IGF1dG8mIHBhdGgpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVCb3hMZWdhY3lQYXRoLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lQm94TGVnYWN5 UGF0aC5oCmluZGV4IDE1OTI0YzMzZjFmN2IyOTFmNzRiMDFhMWZiODE1ODFmZjM4ODIxZTEuLmY0 OGUzMWJmNGFlMDFlN2VmMjMwOWZiZDc0N2FiZTg5OGE5NDdlYzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVCb3hMZWdhY3lQ YXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJh dG9yTGluZUJveExlZ2FjeVBhdGguaApAQCAtNDksNiArNDksOCBAQCBwdWJsaWM6CiAgICAgZmxv YXQgY29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmVCb3goKSBjb25z dCB7IHJldHVybiBtX3Jvb3RJbmxpbmVCb3gtPnNlbGVjdGlvbkJvdHRvbSgpLnRvRmxvYXQoKTsg fQogICAgIGZsb2F0IHRvcCgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+bGluZUJv eFRvcCgpLnRvRmxvYXQoKTsgfQogICAgIGZsb2F0IGJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIG1f cm9vdElubGluZUJveC0+bGluZUJveEJvdHRvbSgpLnRvRmxvYXQoKTsgfQorICAgIGZsb2F0IGlu a092ZXJmbG93VG9wKCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94LT5sb2dpY2FsVG9w VmlzdWFsT3ZlcmZsb3coKTsgfQorICAgIGZsb2F0IGlua092ZXJmbG93Qm90dG9tKCkgY29uc3Qg eyByZXR1cm4gbV9yb290SW5saW5lQm94LT5sb2dpY2FsQm90dG9tVmlzdWFsT3ZlcmZsb3coKTsg fQogCiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxMZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9yb290 SW5saW5lQm94LT5sb2dpY2FsTGVmdCgpOyB9CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxSaWdo dCgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+bG9naWNhbFJpZ2h0KCk7IH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRv ckxpbmVCb3hNb2Rlcm5QYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v SW5saW5lSXRlcmF0b3JMaW5lQm94TW9kZXJuUGF0aC5oCmluZGV4IDcwYmJiYjQwZjU1MGYxYzE1 ODQxMDY3YmNhYjE5ZmJlNzEwMjA3YjEuLmFmYjJjMGQwNzZmOTBmMjkyMmY4MDRmYzcyYWQyNjc0 MDIzZGFmYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9J bmxpbmVJdGVyYXRvckxpbmVCb3hNb2Rlcm5QYXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZUJveE1vZGVyblBhdGguaApAQCAtNTMs NiArNTMsOCBAQCBwdWJsaWM6CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxCb3R0b20oKSBjb25z dCB7IHJldHVybiBsaW5lKCkuZW5jbG9zaW5nQ29udGVudEJvdHRvbSgpOyB9CiAgICAgZmxvYXQg dG9wKCkgY29uc3QgeyByZXR1cm4gbGluZSgpLmxpbmVCb3hUb3AoKTsgfQogICAgIGZsb2F0IGJv dHRvbSgpIGNvbnN0IHsgcmV0dXJuIGxpbmUoKS5saW5lQm94Qm90dG9tKCk7IH0KKyAgICBmbG9h dCBpbmtPdmVyZmxvd1RvcCgpIGNvbnN0IHsgcmV0dXJuIGxpbmUoKS5pbmtPdmVyZmxvdygpLnko KTsgfQorICAgIGZsb2F0IGlua092ZXJmbG93Qm90dG9tKCkgY29uc3QgeyByZXR1cm4gbGluZSgp Lmlua092ZXJmbG93KCkubWF4WSgpOyB9CiAKICAgICBmbG9hdCBjb250ZW50TG9naWNhbFRvcEFk anVzdGVkRm9yUHJlY2VkaW5nTGluZUJveCgpIGNvbnN0IHsgcmV0dXJuICFtX2xpbmVJbmRleCA/ IGNvbnRlbnRMb2dpY2FsVG9wKCkgOiBMaW5lQm94SXRlcmF0b3JNb2Rlcm5QYXRoKCptX2lubGlu ZUNvbnRlbnQsIG1fbGluZUluZGV4IC0gMSkuY29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZv ckZvbGxvd2luZ0xpbmVCb3goKTsgfQogICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25M aW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IDJhODYwNDlhZDg3ZmViN2MxNjUwZTI1N2Rl OWUyMmVkMzcyZTBiODcuLmY0YjRiMGMwNmU1ZDZjYjg4ODg1OGU5Yjc4OGMwYmI5YzYwYjI1NTUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC00OTIsNiArNDkyLDExIEBA IHNpemVfdCBMaW5lTGF5b3V0OjpsaW5lQ291bnQoKSBjb25zdAogICAgIHJldHVybiBtX2lubGlu ZUNvbnRlbnQtPmxpbmVzLnNpemUoKTsKIH0KIAorYm9vbCBMaW5lTGF5b3V0OjpoYXNWaXN1YWxP dmVyZmxvdygpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1faW5saW5lQ29udGVudCA/IG1faW5saW5l Q29udGVudC0+aGFzVmlzdWFsT3ZlcmZsb3coKSA6IGZhbHNlOworfQorCiBMYXlvdXRVbml0IExp bmVMYXlvdXQ6OmZpcnN0TGluZVBoeXNpY2FsQmFzZWxpbmUoKSBjb25zdAogewogICAgIGlmICgh bV9pbmxpbmVDb250ZW50IHx8IG1faW5saW5lQ29udGVudC0+bGluZXMuaXNFbXB0eSgpKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25MaW5lTGF5b3V0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmgKaW5kZXggNzM2N2NlMzViNzg3MDEyYjcxMWMzYmI1 MTMzNGJjMmZkNTE3MDU2My4uMzExNDE5Y2YyNmU1YjgxZGI3NzI2ZjQyYzJjMGNhMDYyYWFmZDI4 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uTGluZUxheW91dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaApAQCAtOTEsMjEgKzkxLDIyIEBAIHB1 YmxpYzoKICAgICBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gY29tcHV0ZUludHJp bnNpY1dpZHRoQ29uc3RyYWludHMoKTsKIAogICAgIHZvaWQgbGF5b3V0KCk7CisgICAgdm9pZCBw YWludChQYWludEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQpOworICAgIGJv b2wgaGl0VGVzdChjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBjb25zdCBI aXRUZXN0TG9jYXRpb24mLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhp dFRlc3RBY3Rpb24pOworICAgIHZvaWQgYWRqdXN0Rm9yUGFnaW5hdGlvbigpOworCisgICAgdm9p ZCBjb2xsZWN0T3ZlcmZsb3coKTsKKyAgICBMYXlvdXRSZWN0IHZpc3VhbE92ZXJmbG93Qm91bmRp bmdCb3hSZWN0Rm9yKGNvbnN0IFJlbmRlcklubGluZSYpIGNvbnN0OworICAgIFZlY3RvcjxGbG9h dFJlY3Q+IGNvbGxlY3RJbmxpbmVCb3hSZWN0cyhjb25zdCBSZW5kZXJJbmxpbmUmKSBjb25zdDsK IAorICAgIGJvb2wgaXNQYWdpbmF0ZWQoKSBjb25zdCB7IHJldHVybiBtX2lzUGFnaW5hdGVkQ29u dGVudDsgfQogICAgIExheW91dFVuaXQgY29udGVudExvZ2ljYWxIZWlnaHQoKSBjb25zdDsKICAg ICBzaXplX3QgbGluZUNvdW50KCkgY29uc3Q7Ci0KKyAgICBib29sIGhhc1Zpc3VhbE92ZXJmbG93 KCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBmaXJzdExpbmVQaHlzaWNhbEJhc2VsaW5lKCkgY29u c3Q7CiAgICAgTGF5b3V0VW5pdCBsYXN0TGluZUxvZ2ljYWxCYXNlbGluZSgpIGNvbnN0OwotCi0g ICAgdm9pZCBhZGp1c3RGb3JQYWdpbmF0aW9uKCk7Ci0gICAgdm9pZCBjb2xsZWN0T3ZlcmZsb3co KTsKLQotICAgIGNvbnN0IElubGluZUNvbnRlbnQqIGlubGluZUNvbnRlbnQoKSBjb25zdCB7IHJl dHVybiBtX2lubGluZUNvbnRlbnQuZ2V0KCk7IH0KLSAgICBib29sIGlzUGFnaW5hdGVkKCkgY29u c3QgeyByZXR1cm4gbV9pc1BhZ2luYXRlZENvbnRlbnQ7IH0KLQotICAgIHZvaWQgcGFpbnQoUGFp bnRJbmZvJiwgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0KTsKLSAgICBib29sIGhpdFRl c3QoY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBIaXRUZXN0UmVzdWx0JiwgY29uc3QgSGl0VGVzdExv Y2F0aW9uJiwgY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBIaXRUZXN0QWN0 aW9uKTsKKyAgICBMYXlvdXRSZWN0IGZpcnN0SW5saW5lQm94UmVjdChjb25zdCBSZW5kZXJJbmxp bmUmKSBjb25zdDsKKyAgICBMYXlvdXRSZWN0IGVuY2xvc2luZ0JvcmRlckJveFJlY3RGb3IoY29u c3QgUmVuZGVySW5saW5lJikgY29uc3Q7CiAKICAgICBJbmxpbmVJdGVyYXRvcjo6VGV4dEJveEl0 ZXJhdG9yIHRleHRCb3hlc0Zvcihjb25zdCBSZW5kZXJUZXh0JikgY29uc3Q7CiAgICAgSW5saW5l SXRlcmF0b3I6OkxlYWZCb3hJdGVyYXRvciBib3hGb3IoY29uc3QgUmVuZGVyRWxlbWVudCYpIGNv bnN0OwpAQCAtMTE0LDExICsxMTUsNiBAQCBwdWJsaWM6CiAgICAgSW5saW5lSXRlcmF0b3I6Okxp bmVCb3hJdGVyYXRvciBmaXJzdExpbmVCb3goKSBjb25zdDsKICAgICBJbmxpbmVJdGVyYXRvcjo6 TGluZUJveEl0ZXJhdG9yIGxhc3RMaW5lQm94KCkgY29uc3Q7CiAKLSAgICBMYXlvdXRSZWN0IGZp cnN0SW5saW5lQm94UmVjdChjb25zdCBSZW5kZXJJbmxpbmUmKSBjb25zdDsKLSAgICBMYXlvdXRS ZWN0IGVuY2xvc2luZ0JvcmRlckJveFJlY3RGb3IoY29uc3QgUmVuZGVySW5saW5lJikgY29uc3Q7 Ci0gICAgTGF5b3V0UmVjdCB2aXN1YWxPdmVyZmxvd0JvdW5kaW5nQm94UmVjdEZvcihjb25zdCBS ZW5kZXJJbmxpbmUmKSBjb25zdDsKLSAgICBWZWN0b3I8RmxvYXRSZWN0PiBjb2xsZWN0SW5saW5l Qm94UmVjdHMoY29uc3QgUmVuZGVySW5saW5lJikgY29uc3Q7Ci0KICAgICBjb25zdCBSZW5kZXJP YmplY3QmIHJlbmRlcmVyRm9yTGF5b3V0Qm94KGNvbnN0IExheW91dDo6Qm94JikgY29uc3Q7CiAg ICAgY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93KCkgY29uc3QgeyByZXR1cm4gbV9ib3hUcmVl LmZsb3coKTsgfQogICAgIFJlbmRlckJsb2NrRmxvdyYgZmxvdygpIHsgcmV0dXJuIG1fYm94VHJl ZS5mbG93KCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5j cHAKaW5kZXggMWFkZmQ5NzFkNDlhNDBkZDIwOGVjMDczMTVhZDIzMDEyYzg2NTg0MS4uODNjZjVh NmNhZDM4ZmIwMWQyNTU3MTAxYTBjMWY0NmM0YzQ3ZDI5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTM2NDUsMTMgKzM2NDUsMTEgQEAgdm9p ZCBSZW5kZXJCbG9ja0Zsb3c6OmxheW91dE1vZGVybkxpbmVzKGJvb2wgcmVsYXlvdXRDaGlsZHJl biwgTGF5b3V0VW5pdCYgcmVwYWkKICAgICByZXBhaW50TG9naWNhbEJvdHRvbSA9IHN0ZDo6bWF4 KG9sZEJvcmRlckJveEJvdHRvbSwgbmV3Qm9yZGVyQm94Qm90dG9tKTsKIAogICAgIGF1dG8gaW5m bGF0ZVJlcGFpbnRUb3BBbmRCb3R0b21XaXRoSW5rT3ZlcmZsb3cgPSBbJl0gewotICAgICAgICBh dXRvKiBpbmxpbmVDb250ZW50ID0gbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0Lmlu bGluZUNvbnRlbnQoKTsKLSAgICAgICAgaWYgKCFpbmxpbmVDb250ZW50IHx8ICFpbmxpbmVDb250 ZW50LT5oYXNWaXN1YWxPdmVyZmxvdygpKQorICAgICAgICBpZiAoIWxheW91dEZvcm1hdHRpbmdD b250ZXh0TGluZUxheW91dC5oYXNWaXN1YWxPdmVyZmxvdygpKQogICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICBmb3IgKGF1dG8mIGxpbmUgOiBpbmxpbmVDb250ZW50LT5saW5lcykgewotICAg ICAgICAgICAgYXV0byBpbmtPdmVyZmxvdyA9IExheW91dFJlY3QgeyBsaW5lLmlua092ZXJmbG93 KCkgfTsKLSAgICAgICAgICAgIHJlcGFpbnRMb2dpY2FsVG9wID0gc3RkOjptaW4ocmVwYWludExv Z2ljYWxUb3AsIGlua092ZXJmbG93LnkoKSk7Ci0gICAgICAgICAgICByZXBhaW50TG9naWNhbEJv dHRvbSA9IHN0ZDo6bWF4KHJlcGFpbnRMb2dpY2FsQm90dG9tLCBpbmtPdmVyZmxvdy5tYXhZKCkp OworICAgICAgICBmb3IgKGF1dG8gbGluZUJveCA9IElubGluZUl0ZXJhdG9yOjpmaXJzdExpbmVC b3hGb3IoKnRoaXMpOyBsaW5lQm94OyBsaW5lQm94LnRyYXZlcnNlTmV4dCgpKSB7CisgICAgICAg ICAgICByZXBhaW50TG9naWNhbFRvcCA9IHN0ZDo6bWluKHJlcGFpbnRMb2dpY2FsVG9wLCBMYXlv dXRVbml0IHsgbGluZUJveC0+aW5rT3ZlcmZsb3dUb3AoKSB9KTsKKyAgICAgICAgICAgIHJlcGFp bnRMb2dpY2FsQm90dG9tID0gc3RkOjptYXgocmVwYWludExvZ2ljYWxCb3R0b20sIExheW91dFVu aXQgeyBsaW5lQm94LT5pbmtPdmVyZmxvd0JvdHRvbSgpIH0pOwogICAgICAgICB9CiAgICAgfTsK ICAgICBpbmZsYXRlUmVwYWludFRvcEFuZEJvdHRvbVdpdGhJbmtPdmVyZmxvdygpOwo= 457295 2022-04-11 15:49:20 -0700 2022-04-11 18:31:22 -0700 Patch bug-239059-20220411154919.patch text/plain 9961 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTY1MWQ4Y2RhMTJmNjZj YmM2ZGE4OTEwMzRhY2Q0ZmI1YTRjODlkNy4uMDY2YWJlYjZiMjZhNDNjOTE5YmQ1OTQ3ODQzNmU2 OTFmNjY5NDg4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTA0LTExICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQgc2hvdWxkIG5vdCBleHBvc2UgSW5saW5lQ29u dGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM5 MDU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgSW1w bGVtZW50IGlua092ZXJmbG93VG9wL2lua092ZXJmbG93Qm90dG9tIGZvciBpbmxpbmUgaXRlcmF0 b3IgKExpbmVCb3gpIHNvIHRoYXQgd2UgY2FuCisgICAgICAgIGtlZXAgSW5saW5lQ29udGVudCBp bnRlcm5hbCB0byBMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dC4KKworICAgICAgICAqIGxh eW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVCb3guaDoKKyAgICAgICAgKFdlYkNv cmU6OklubGluZUl0ZXJhdG9yOjpMaW5lQm94OjppbmtPdmVyZmxvd1RvcCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUJveDo6aW5rT3ZlcmZsb3dCb3R0b20g Y29uc3QpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVC b3hMZWdhY3lQYXRoLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUJv eEl0ZXJhdG9yTGVnYWN5UGF0aDo6aW5rT3ZlcmZsb3dUb3AgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVCb3hJdGVyYXRvckxlZ2FjeVBhdGg6Omlua092ZXJm bG93Qm90dG9tIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRl cmF0b3JMaW5lQm94TW9kZXJuUGF0aC5oOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0 b3I6OkxpbmVCb3hJdGVyYXRvck1vZGVyblBhdGg6Omlua092ZXJmbG93VG9wIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lQm94SXRlcmF0b3JNb2Rlcm5QYXRo OjppbmtPdmVyZmxvd0JvdHRvbSBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6aGFzVmlzdWFsT3ZlcmZsb3cgY29uc3QpOgorICAg ICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojppc1BhZ2lu YXRlZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxh eW91dDo6aW5saW5lQ29udGVudCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJsb2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6 OmxheW91dE1vZGVybkxpbmVzKToKKwogMjAyMi0wNC0xMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBsaXN0TWFya2VyVGV4dEZvck5vZGVBbmRQb3Np dGlvbigpIHRvIHJldHVybiBhIFN0cmluZ1ZpZXcgaW5zdGVhZCBvZiBhIFN0cmluZwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGlu ZUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9y TGluZUJveC5oCmluZGV4IDczZDhjOTdkMWIzNDcxMWY4MjhiYmNhNGNhNTI2MGQxOTE2NjdjMmYu LjEwZjk4MzEzODlkZjM1OTRiMmZjZDU2NzEyNmZhN2FhZjVjMDU2MjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVCb3guaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5l Qm94LmgKQEAgLTY3LDYgKzY3LDkgQEAgcHVibGljOgogICAgIGZsb2F0IGNvbnRlbnRMb2dpY2Fs VG9wQWRqdXN0ZWRGb3JQcmVjZWRpbmdMaW5lQm94KCkgY29uc3Q7CiAgICAgZmxvYXQgY29udGVu dExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmVCb3goKSBjb25zdDsKIAorICAg IGZsb2F0IGlua092ZXJmbG93VG9wKCkgY29uc3Q7CisgICAgZmxvYXQgaW5rT3ZlcmZsb3dCb3R0 b20oKSBjb25zdDsKKwogICAgIGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgY29udGFpbmluZ0Jsb2Nr KCkgY29uc3Q7CiAgICAgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGNvbnRhaW5pbmdGcmFnbWVu dCgpIGNvbnN0OwogCkBAIC0xODAsNiArMTgzLDIwIEBAIGlubGluZSBmbG9hdCBMaW5lQm94Ojpi b3R0b20oKSBjb25zdAogICAgIH0pOwogfQogCitpbmxpbmUgZmxvYXQgTGluZUJveDo6aW5rT3Zl cmZsb3dUb3AoKSBjb25zdAoreworICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKG1fcGF0aFZhcmlh bnQsIFtdKGNvbnN0IGF1dG8mIHBhdGgpIHsKKyAgICAgICAgcmV0dXJuIHBhdGguaW5rT3ZlcmZs b3dUb3AoKTsKKyAgICB9KTsKK30KKworaW5saW5lIGZsb2F0IExpbmVCb3g6Omlua092ZXJmbG93 Qm90dG9tKCkgY29uc3QKK3sKKyAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbihtX3BhdGhWYXJpYW50 LCBbXShjb25zdCBhdXRvJiBwYXRoKSB7CisgICAgICAgIHJldHVybiBwYXRoLmlua092ZXJmbG93 Qm90dG9tKCk7CisgICAgfSk7Cit9CisKIGlubGluZSBmbG9hdCBMaW5lQm94Ojpjb250ZW50TG9n aWNhbExlZnQoKSBjb25zdAogewogICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKG1fcGF0aFZhcmlh bnQsIFtdKGNvbnN0IGF1dG8mIHBhdGgpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVCb3hMZWdhY3lQYXRoLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lQm94TGVnYWN5 UGF0aC5oCmluZGV4IDE1OTI0YzMzZjFmN2IyOTFmNzRiMDFhMWZiODE1ODFmZjM4ODIxZTEuLmY0 OGUzMWJmNGFlMDFlN2VmMjMwOWZiZDc0N2FiZTg5OGE5NDdlYzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVCb3hMZWdhY3lQ YXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJh dG9yTGluZUJveExlZ2FjeVBhdGguaApAQCAtNDksNiArNDksOCBAQCBwdWJsaWM6CiAgICAgZmxv YXQgY29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmVCb3goKSBjb25z dCB7IHJldHVybiBtX3Jvb3RJbmxpbmVCb3gtPnNlbGVjdGlvbkJvdHRvbSgpLnRvRmxvYXQoKTsg fQogICAgIGZsb2F0IHRvcCgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+bGluZUJv eFRvcCgpLnRvRmxvYXQoKTsgfQogICAgIGZsb2F0IGJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIG1f cm9vdElubGluZUJveC0+bGluZUJveEJvdHRvbSgpLnRvRmxvYXQoKTsgfQorICAgIGZsb2F0IGlu a092ZXJmbG93VG9wKCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94LT5sb2dpY2FsVG9w VmlzdWFsT3ZlcmZsb3coKTsgfQorICAgIGZsb2F0IGlua092ZXJmbG93Qm90dG9tKCkgY29uc3Qg eyByZXR1cm4gbV9yb290SW5saW5lQm94LT5sb2dpY2FsQm90dG9tVmlzdWFsT3ZlcmZsb3coKTsg fQogCiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxMZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9yb290 SW5saW5lQm94LT5sb2dpY2FsTGVmdCgpOyB9CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxSaWdo dCgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+bG9naWNhbFJpZ2h0KCk7IH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRv ckxpbmVCb3hNb2Rlcm5QYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v SW5saW5lSXRlcmF0b3JMaW5lQm94TW9kZXJuUGF0aC5oCmluZGV4IDcwYmJiYjQwZjU1MGYxYzE1 ODQxMDY3YmNhYjE5ZmJlNzEwMjA3YjEuLmFmYjJjMGQwNzZmOTBmMjkyMmY4MDRmYzcyYWQyNjc0 MDIzZGFmYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9J bmxpbmVJdGVyYXRvckxpbmVCb3hNb2Rlcm5QYXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZUJveE1vZGVyblBhdGguaApAQCAtNTMs NiArNTMsOCBAQCBwdWJsaWM6CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxCb3R0b20oKSBjb25z dCB7IHJldHVybiBsaW5lKCkuZW5jbG9zaW5nQ29udGVudEJvdHRvbSgpOyB9CiAgICAgZmxvYXQg dG9wKCkgY29uc3QgeyByZXR1cm4gbGluZSgpLmxpbmVCb3hUb3AoKTsgfQogICAgIGZsb2F0IGJv dHRvbSgpIGNvbnN0IHsgcmV0dXJuIGxpbmUoKS5saW5lQm94Qm90dG9tKCk7IH0KKyAgICBmbG9h dCBpbmtPdmVyZmxvd1RvcCgpIGNvbnN0IHsgcmV0dXJuIGxpbmUoKS5pbmtPdmVyZmxvdygpLnko KTsgfQorICAgIGZsb2F0IGlua092ZXJmbG93Qm90dG9tKCkgY29uc3QgeyByZXR1cm4gbGluZSgp Lmlua092ZXJmbG93KCkubWF4WSgpOyB9CiAKICAgICBmbG9hdCBjb250ZW50TG9naWNhbFRvcEFk anVzdGVkRm9yUHJlY2VkaW5nTGluZUJveCgpIGNvbnN0IHsgcmV0dXJuICFtX2xpbmVJbmRleCA/ IGNvbnRlbnRMb2dpY2FsVG9wKCkgOiBMaW5lQm94SXRlcmF0b3JNb2Rlcm5QYXRoKCptX2lubGlu ZUNvbnRlbnQsIG1fbGluZUluZGV4IC0gMSkuY29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZv ckZvbGxvd2luZ0xpbmVCb3goKTsgfQogICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25M aW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IDJhODYwNDlhZDg3ZmViN2MxNjUwZTI1N2Rl OWUyMmVkMzcyZTBiODcuLmY0ZDU4MDhkM2YwYTQzNjFlY2E5Njc1N2JmYTIzNjdjYjExNjBlYjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC00OTIsNiArNDkyLDExIEBA IHNpemVfdCBMaW5lTGF5b3V0OjpsaW5lQ291bnQoKSBjb25zdAogICAgIHJldHVybiBtX2lubGlu ZUNvbnRlbnQtPmxpbmVzLnNpemUoKTsKIH0KIAorYm9vbCBMaW5lTGF5b3V0OjpoYXNWaXN1YWxP dmVyZmxvdygpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1faW5saW5lQ29udGVudCAmJiBtX2lubGlu ZUNvbnRlbnQtPmhhc1Zpc3VhbE92ZXJmbG93KCk7Cit9CisKIExheW91dFVuaXQgTGluZUxheW91 dDo6Zmlyc3RMaW5lUGh5c2ljYWxCYXNlbGluZSgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2lubGlu ZUNvbnRlbnQgfHwgbV9pbmxpbmVDb250ZW50LT5saW5lcy5pc0VtcHR5KCkpIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmVMYXlvdXQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkxpbmVMYXlvdXQuaAppbmRleCA3MzY3Y2UzNWI3ODcwMTJiNzExYzNiYjUxMzM0YmMy ZmQ1MTcwNTYzLi4zMTE0MTljZjI2ZTViODFkYjc3MjZmNDJjMmMwY2EwNjJhYWZkMjg5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25MaW5lTGF5b3V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xh eW91dEludGVncmF0aW9uTGluZUxheW91dC5oCkBAIC05MSwyMSArOTEsMjIgQEAgcHVibGljOgog ICAgIHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBjb21wdXRlSW50cmluc2ljV2lk dGhDb25zdHJhaW50cygpOwogCiAgICAgdm9pZCBsYXlvdXQoKTsKKyAgICB2b2lkIHBhaW50KFBh aW50SW5mbyYsIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCk7CisgICAgYm9vbCBoaXRU ZXN0KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEhpdFRlc3RM b2NhdGlvbiYsIGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCwgSGl0VGVzdEFj dGlvbik7CisgICAgdm9pZCBhZGp1c3RGb3JQYWdpbmF0aW9uKCk7CisKKyAgICB2b2lkIGNvbGxl Y3RPdmVyZmxvdygpOworICAgIExheW91dFJlY3QgdmlzdWFsT3ZlcmZsb3dCb3VuZGluZ0JveFJl Y3RGb3IoY29uc3QgUmVuZGVySW5saW5lJikgY29uc3Q7CisgICAgVmVjdG9yPEZsb2F0UmVjdD4g Y29sbGVjdElubGluZUJveFJlY3RzKGNvbnN0IFJlbmRlcklubGluZSYpIGNvbnN0OwogCisgICAg Ym9vbCBpc1BhZ2luYXRlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNQYWdpbmF0ZWRDb250ZW50OyB9 CiAgICAgTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbEhlaWdodCgpIGNvbnN0OwogICAgIHNpemVf dCBsaW5lQ291bnQoKSBjb25zdDsKLQorICAgIGJvb2wgaGFzVmlzdWFsT3ZlcmZsb3coKSBjb25z dDsKICAgICBMYXlvdXRVbml0IGZpcnN0TGluZVBoeXNpY2FsQmFzZWxpbmUoKSBjb25zdDsKICAg ICBMYXlvdXRVbml0IGxhc3RMaW5lTG9naWNhbEJhc2VsaW5lKCkgY29uc3Q7Ci0KLSAgICB2b2lk IGFkanVzdEZvclBhZ2luYXRpb24oKTsKLSAgICB2b2lkIGNvbGxlY3RPdmVyZmxvdygpOwotCi0g ICAgY29uc3QgSW5saW5lQ29udGVudCogaW5saW5lQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1f aW5saW5lQ29udGVudC5nZXQoKTsgfQotICAgIGJvb2wgaXNQYWdpbmF0ZWQoKSBjb25zdCB7IHJl dHVybiBtX2lzUGFnaW5hdGVkQ29udGVudDsgfQotCi0gICAgdm9pZCBwYWludChQYWludEluZm8m LCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQpOwotICAgIGJvb2wgaGl0VGVzdChjb25z dCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBjb25zdCBIaXRUZXN0TG9jYXRpb24m LCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhpdFRlc3RBY3Rpb24pOwor ICAgIExheW91dFJlY3QgZmlyc3RJbmxpbmVCb3hSZWN0KGNvbnN0IFJlbmRlcklubGluZSYpIGNv bnN0OworICAgIExheW91dFJlY3QgZW5jbG9zaW5nQm9yZGVyQm94UmVjdEZvcihjb25zdCBSZW5k ZXJJbmxpbmUmKSBjb25zdDsKIAogICAgIElubGluZUl0ZXJhdG9yOjpUZXh0Qm94SXRlcmF0b3Ig dGV4dEJveGVzRm9yKGNvbnN0IFJlbmRlclRleHQmKSBjb25zdDsKICAgICBJbmxpbmVJdGVyYXRv cjo6TGVhZkJveEl0ZXJhdG9yIGJveEZvcihjb25zdCBSZW5kZXJFbGVtZW50JikgY29uc3Q7CkBA IC0xMTQsMTEgKzExNSw2IEBAIHB1YmxpYzoKICAgICBJbmxpbmVJdGVyYXRvcjo6TGluZUJveEl0 ZXJhdG9yIGZpcnN0TGluZUJveCgpIGNvbnN0OwogICAgIElubGluZUl0ZXJhdG9yOjpMaW5lQm94 SXRlcmF0b3IgbGFzdExpbmVCb3goKSBjb25zdDsKIAotICAgIExheW91dFJlY3QgZmlyc3RJbmxp bmVCb3hSZWN0KGNvbnN0IFJlbmRlcklubGluZSYpIGNvbnN0OwotICAgIExheW91dFJlY3QgZW5j bG9zaW5nQm9yZGVyQm94UmVjdEZvcihjb25zdCBSZW5kZXJJbmxpbmUmKSBjb25zdDsKLSAgICBM YXlvdXRSZWN0IHZpc3VhbE92ZXJmbG93Qm91bmRpbmdCb3hSZWN0Rm9yKGNvbnN0IFJlbmRlcklu bGluZSYpIGNvbnN0OwotICAgIFZlY3RvcjxGbG9hdFJlY3Q+IGNvbGxlY3RJbmxpbmVCb3hSZWN0 cyhjb25zdCBSZW5kZXJJbmxpbmUmKSBjb25zdDsKLQogICAgIGNvbnN0IFJlbmRlck9iamVjdCYg cmVuZGVyZXJGb3JMYXlvdXRCb3goY29uc3QgTGF5b3V0OjpCb3gmKSBjb25zdDsKICAgICBjb25z dCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3coKSBjb25zdCB7IHJldHVybiBtX2JveFRyZWUuZmxvdygp OyB9CiAgICAgUmVuZGVyQmxvY2tGbG93JiBmbG93KCkgeyByZXR1cm4gbV9ib3hUcmVlLmZsb3co KTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRl eCAxYWRmZDk3MWQ0OWE0MGRkMjA4ZWMwNzMxNWFkMjMwMTJjODY1ODQxLi44M2NmNWE2Y2FkMzhm YjAxZDI1NTcxMDFhMGMxZjQ2YzRjNDdkMjlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMzY0NSwxMyArMzY0NSwxMSBAQCB2b2lkIFJlbmRl ckJsb2NrRmxvdzo6bGF5b3V0TW9kZXJuTGluZXMoYm9vbCByZWxheW91dENoaWxkcmVuLCBMYXlv dXRVbml0JiByZXBhaQogICAgIHJlcGFpbnRMb2dpY2FsQm90dG9tID0gc3RkOjptYXgob2xkQm9y ZGVyQm94Qm90dG9tLCBuZXdCb3JkZXJCb3hCb3R0b20pOwogCiAgICAgYXV0byBpbmZsYXRlUmVw YWludFRvcEFuZEJvdHRvbVdpdGhJbmtPdmVyZmxvdyA9IFsmXSB7Ci0gICAgICAgIGF1dG8qIGlu bGluZUNvbnRlbnQgPSBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuaW5saW5lQ29u dGVudCgpOwotICAgICAgICBpZiAoIWlubGluZUNvbnRlbnQgfHwgIWlubGluZUNvbnRlbnQtPmhh c1Zpc3VhbE92ZXJmbG93KCkpCisgICAgICAgIGlmICghbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRM aW5lTGF5b3V0Lmhhc1Zpc3VhbE92ZXJmbG93KCkpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgIGZvciAoYXV0byYgbGluZSA6IGlubGluZUNvbnRlbnQtPmxpbmVzKSB7Ci0gICAgICAgICAg ICBhdXRvIGlua092ZXJmbG93ID0gTGF5b3V0UmVjdCB7IGxpbmUuaW5rT3ZlcmZsb3coKSB9Owot ICAgICAgICAgICAgcmVwYWludExvZ2ljYWxUb3AgPSBzdGQ6Om1pbihyZXBhaW50TG9naWNhbFRv cCwgaW5rT3ZlcmZsb3cueSgpKTsKLSAgICAgICAgICAgIHJlcGFpbnRMb2dpY2FsQm90dG9tID0g c3RkOjptYXgocmVwYWludExvZ2ljYWxCb3R0b20sIGlua092ZXJmbG93Lm1heFkoKSk7CisgICAg ICAgIGZvciAoYXV0byBsaW5lQm94ID0gSW5saW5lSXRlcmF0b3I6OmZpcnN0TGluZUJveEZvcigq dGhpcyk7IGxpbmVCb3g7IGxpbmVCb3gudHJhdmVyc2VOZXh0KCkpIHsKKyAgICAgICAgICAgIHJl cGFpbnRMb2dpY2FsVG9wID0gc3RkOjptaW4ocmVwYWludExvZ2ljYWxUb3AsIExheW91dFVuaXQg eyBsaW5lQm94LT5pbmtPdmVyZmxvd1RvcCgpIH0pOworICAgICAgICAgICAgcmVwYWludExvZ2lj YWxCb3R0b20gPSBzdGQ6Om1heChyZXBhaW50TG9naWNhbEJvdHRvbSwgTGF5b3V0VW5pdCB7IGxp bmVCb3gtPmlua092ZXJmbG93Qm90dG9tKCkgfSk7CiAgICAgICAgIH0KICAgICB9OwogICAgIGlu ZmxhdGVSZXBhaW50VG9wQW5kQm90dG9tV2l0aElua092ZXJmbG93KCk7Cg==