233222 2021-11-16 16:48:51 -0800 [LFC][IFC] break-word is not considered when calculating min-content intrinsic sizes. 2021-11-17 07:11:22 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1815720 0 zalan 2021-11-16 16:48:51 -0800 https://drafts.csswg.org/css-text/#overflow-wrap-property 1815723 1 444454 zalan 2021-11-16 16:50:32 -0800 Created attachment 444454 Patch 1815816 2 444454 koivisto 2021-11-16 21:28:43 -0800 Comment on attachment 444454 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=444454&action=review > Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.h:155 > + bool m_isIntrinsicWidthMode { false }; m_isInIntrinsicWidthMode would read better. Or enum class WidthMode : bool { Layout, Intrinsic }; WidthMode m_widthMode; 1815912 3 444513 zalan 2021-11-17 06:36:37 -0800 Created attachment 444513 Patch 1815926 4 ews-feeder 2021-11-17 07:10:59 -0800 Committed r285930 (244339@main): <https://commits.webkit.org/244339@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444513. 1815927 5 webkit-bug-importer 2021-11-17 07:11:22 -0800 <rdar://problem/85503079> 444454 2021-11-16 16:50:32 -0800 2021-11-17 06:36:34 -0800 Patch bug-233222-20211116165031.patch text/plain 7665 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2NmMWUzYmYzMWY3Zjlj OGI2OTRjNzNmZjlkMDg0YzBiOWFhNjY5ZS4uNjRiMzc1ZTQ0NzM2ZjVmOTU4MjY0YWI0MGNjMDZk OWZmZjJjMzI4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTExLTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIGJyZWFrLXdv cmQgaXMgbm90IGNvbnNpZGVyZWQgd2hlbiBjYWxjdWxhdGluZyBtaW4tY29udGVudCBpbnRyaW5z aWMgc2l6ZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzMyMjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTZWUgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy10ZXh0LyNvdmVyZmxvdy13cmFwLXBy b3BlcnR5CisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVDb250ZW50QnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNv bnRlbnRCcmVha2VyOjpJbmxpbmVDb250ZW50QnJlYWtlcik6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjp3b3JkQnJlYWtCZWhhdmlvciBjb25zdCk6Cisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJy ZWFrZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6 OmlzSW50cmluc2ljV2lkdGhNb2RlIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpwbGFjZUlubGluZUNvbnRlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZSBjb25z dCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmlzSW50 cmluc2ljV2lkdGhNb2RlIGNvbnN0KToKKwogMjAyMS0xMS0xNiAgQW5kcmVzIEdvbnphbGV6ICA8 YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGZvciBhY2Nlc3NpYmlsaXR5L21h Yy9yZXBsYWNlLXRleHQtd2l0aC1yYW5nZS1vbi13ZWJhcmVhLWVsZW1lbnQuaHRtbCBpbiBpc29s YXRlZCB0cmVlIG1vZGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtl ci5jcHAKaW5kZXggZGFmOGYyODE2YTBlOGY3ZTg2OGFkNTJmMzgzNDRhNDY0M2NmYzQ5Mi4uMjgy YjBkMmUxNjdkNWZlZGI1Y2FiMzhiMWRkZGJjM2NkMjQwYWMwNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJy ZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcApAQCAtMTI1LDYgKzEyNSwxMSBAQCBzdGF0 aWMgaW5saW5lIHN0ZDo6b3B0aW9uYWw8c2l6ZV90PiBmaXJzdFRleHRSdW5JbmRleChjb25zdCBJ bmxpbmVDb250ZW50QnJlYWtlcgogICAgIHJldHVybiB7IH07CiB9CiAKK0lubGluZUNvbnRlbnRC cmVha2VyOjpJbmxpbmVDb250ZW50QnJlYWtlcihib29sIGlzSW50cmluc2ljV2lkdGhNb2RlKQor ICAgIDogbV9pc0ludHJpbnNpY1dpZHRoTW9kZShpc0ludHJpbnNpY1dpZHRoTW9kZSkKK3sKK30K KwogYm9vbCBJbmxpbmVDb250ZW50QnJlYWtlcjo6c2hvdWxkS2VlcEVuZE9mTGluZVdoaXRlc3Bh Y2UoY29uc3QgQ29udGludW91c0NvbnRlbnQmIGNvbnRpbnVvdXNDb250ZW50KSBjb25zdAogewog ICAgIC8vIEdyYWIgdGhlIHN0eWxlIGFuZCBjaGVjayBmb3Igd2hpdGUtc3BhY2UgcHJvcGVydHkg dG8gZGVjaWRlIHdoZXRoZXIgd2Ugc2hvdWxkIGxldCB0aGlzIHdoaXRlc3BhY2UgY29udGVudCBv dmVyZmxvdyB0aGUgY3VycmVudCBsaW5lLgpAQCAtNjQ2LDEzICs2NTEsMTYgQEAgT3B0aW9uU2V0 PElubGluZUNvbnRlbnRCcmVha2VyOjpXb3JkQnJlYWtSdWxlPiBJbmxpbmVDb250ZW50QnJlYWtl cjo6d29yZEJyZWFrQmUKICAgICAgICAgICAgIHJldHVybiAqd29yZEJyZWFrUnVsZTsKICAgICAg ICAgcmV0dXJuIHsgfTsKICAgICB9OworCisgICAgLy8gU29mdCB3cmFwIG9wcG9ydHVuaXRpZXMg aW50cm9kdWNlZCBieSBicmVhay13b3JkIGFyZSBub3QgY29uc2lkZXJlZCB3aGVuIGNhbGN1bGF0 aW5nIG1pbi1jb250ZW50IGludHJpbnNpYyBzaXplcy4KKyAgICBhdXRvIGJyZWFrV29yZElzQXBw bGljYWJsZSA9ICFpc0ludHJpbnNpY1dpZHRoTW9kZSgpOwogICAgIC8vIEZvciBjb21wYXRpYmls aXR5IHdpdGggbGVnYWN5IGNvbnRlbnQsIHRoZSB3b3JkLWJyZWFrIHByb3BlcnR5IGFsc28gc3Vw cG9ydHMgYSBkZXByZWNhdGVkIGJyZWFrLXdvcmQga2V5d29yZC4KICAgICAvLyBXaGVuIHNwZWNp ZmllZCwgdGhpcyBoYXMgdGhlIHNhbWUgZWZmZWN0IGFzIHdvcmQtYnJlYWs6IG5vcm1hbCBhbmQg b3ZlcmZsb3ctd3JhcDogYW55d2hlcmUsIHJlZ2FyZGxlc3Mgb2YgdGhlIGFjdHVhbCB2YWx1ZSBv ZiB0aGUgb3ZlcmZsb3ctd3JhcCBwcm9wZXJ0eS4KLSAgICBpZiAoc3R5bGUud29yZEJyZWFrKCkg PT0gV29yZEJyZWFrOjpCcmVha1dvcmQgJiYgIWhhc1dyYXBPcHBvcnR1bml0eUF0UHJldmlvdXNQ b3NpdGlvbikKKyAgICBpZiAoKGJyZWFrV29yZElzQXBwbGljYWJsZSAmJiBzdHlsZS53b3JkQnJl YWsoKSA9PSBXb3JkQnJlYWs6OkJyZWFrV29yZCkgJiYgIWhhc1dyYXBPcHBvcnR1bml0eUF0UHJl dmlvdXNQb3NpdGlvbikKICAgICAgICAgcmV0dXJuIGluY2x1ZGVIeXBoZW5hdGlvbklmQWxsb3dl ZChXb3JkQnJlYWtSdWxlOjpBdEFyYml0cmFyeVBvc2l0aW9uKTsKICAgICAvLyBPdmVyZmxvd1dy YXA6OkJyZWFrV29yZC9Bbnl3aGVyZSBBbiBvdGhlcndpc2UgdW5icmVha2FibGUgc2VxdWVuY2Ug b2YgY2hhcmFjdGVycyBtYXkgYmUgYnJva2VuIGF0IGFuIGFyYml0cmFyeSBwb2ludCBpZiB0aGVy ZSBhcmUgbm8gb3RoZXJ3aXNlLWFjY2VwdGFibGUgYnJlYWsgcG9pbnRzIGluIHRoZSBsaW5lLgog ICAgIC8vIE5vdGUgdGhhdCB0aGlzIGFwcGxpZXMgdG8gY29udGVudCB3aGVyZSBDU1MgcHJvcGVy dGllcyAoZS5nLiBXb3JkQnJlYWs6OktlZXBBbGwpIG1ha2UgaXQgdW5icmVha2FibGUuIAotICAg IGlmICgoc3R5bGUub3ZlcmZsb3dXcmFwKCkgPT0gT3ZlcmZsb3dXcmFwOjpCcmVha1dvcmQgfHwg c3R5bGUub3ZlcmZsb3dXcmFwKCkgPT0gT3ZlcmZsb3dXcmFwOjpBbnl3aGVyZSkgJiYgIWhhc1dy YXBPcHBvcnR1bml0eUF0UHJldmlvdXNQb3NpdGlvbikKKyAgICBpZiAoKChicmVha1dvcmRJc0Fw cGxpY2FibGUgJiYgc3R5bGUub3ZlcmZsb3dXcmFwKCkgPT0gT3ZlcmZsb3dXcmFwOjpCcmVha1dv cmQpIHx8IHN0eWxlLm92ZXJmbG93V3JhcCgpID09IE92ZXJmbG93V3JhcDo6QW55d2hlcmUpICYm ICFoYXNXcmFwT3Bwb3J0dW5pdHlBdFByZXZpb3VzUG9zaXRpb24pCiAgICAgICAgIHJldHVybiBp bmNsdWRlSHlwaGVuYXRpb25JZkFsbG93ZWQoV29yZEJyZWFrUnVsZTo6QXRBcmJpdHJhcnlQb3Np dGlvbik7CiAgICAgLy8gQnJlYWtpbmcgaXMgZm9yYmlkZGVuIHdpdGhpbiDigJx3b3Jkc+KAnS4K ICAgICBpZiAoc3R5bGUud29yZEJyZWFrKCkgPT0gV29yZEJyZWFrOjpLZWVwQWxsKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lQ29udGVudEJyZWFrZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmgKaW5kZXggMDlhYWU4YWZlMmVlNjhi NjU1ZWYzNzczNjEzN2FhY2E1MDJiOGM2OC4uYzk0OTUzNzE0YmU5Y2NlOWYxMDNmMzZkMmEwOTJi NzA3M2E2MWE5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5o CkBAIC0zOCw2ICszOCw4IEBAIHN0cnVjdCBDYW5kaWRhdGVUZXh0UnVuRm9yQnJlYWtpbmc7CiAK IGNsYXNzIElubGluZUNvbnRlbnRCcmVha2VyIHsKIHB1YmxpYzoKKyAgICBJbmxpbmVDb250ZW50 QnJlYWtlcihib29sIGlzSW50cmluc2ljV2lkdGhNb2RlKTsKKwogICAgIHN0cnVjdCBQYXJ0aWFs UnVuIHsKICAgICAgICAgc2l6ZV90IGxlbmd0aCB7IDAgfTsKICAgICAgICAgSW5saW5lTGF5b3V0 VW5pdCBsb2dpY2FsV2lkdGggeyAwIH07CkBAIC0xNDgsNyArMTUwLDkgQEAgcHJpdmF0ZToKICAg ICB9OwogICAgIE9wdGlvblNldDxXb3JkQnJlYWtSdWxlPiB3b3JkQnJlYWtCZWhhdmlvcihjb25z dCBSZW5kZXJTdHlsZSYsIGJvb2wgaGFzV3JhcE9wcG9ydHVuaXR5QXRQcmV2aW91c1Bvc2l0aW9u KSBjb25zdDsKICAgICBib29sIHNob3VsZEtlZXBFbmRPZkxpbmVXaGl0ZXNwYWNlKGNvbnN0IENv bnRpbnVvdXNDb250ZW50JikgY29uc3Q7CisgICAgYm9vbCBpc0ludHJpbnNpY1dpZHRoTW9kZSgp IGNvbnN0IHsgcmV0dXJuIG1faXNJbnRyaW5zaWNXaWR0aE1vZGU7IH0KIAorICAgIGJvb2wgbV9p c0ludHJpbnNpY1dpZHRoTW9kZSB7IGZhbHNlIH07CiAgICAgYm9vbCBuX2h5cGhlbmF0aW9uSXNE aXNhYmxlZCB7IGZhbHNlIH07CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVp bGRlci5jcHAKaW5kZXggYjY2MTYwM2NkYjQ2MmVmMzFkZmFiNTA1YThhNjhiMGZlMzI5ZThkNy4u NzY3NGI3NTZlNjc3Y2ViNDJhMWE3ZDYyNDk0MzZmM2MyMDc5NDAyMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1 aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMzkyLDcgKzM5Miw3IEBAIHZvaWQgTGlu ZUJ1aWxkZXI6OmluaXRpYWxpemUoY29uc3QgVXNlZENvbnN0cmFpbnRzJiBsaW5lQ29uc3RyYWlu dHMsIGJvb2wgaXNGaXJzCiBMaW5lQnVpbGRlcjo6Q29tbWl0dGVkQ29udGVudCBMaW5lQnVpbGRl cjo6cGxhY2VJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRS YW5nZSkKIHsKICAgICBhdXRvIGxpbmVDYW5kaWRhdGUgPSBMaW5lQ2FuZGlkYXRlIHsgbGF5b3V0 U3RhdGUoKS5zaG91bGRJZ25vcmVUcmFpbGluZ0xldHRlclNwYWNpbmcoKSB9OwotICAgIGF1dG8g aW5saW5lQ29udGVudEJyZWFrZXIgPSBJbmxpbmVDb250ZW50QnJlYWtlciB7IH07CisgICAgYXV0 byBpbmxpbmVDb250ZW50QnJlYWtlciA9IElubGluZUNvbnRlbnRCcmVha2VyIHsgaXNJbnRyaW5z aWNXaWR0aE1vZGUoKSB9OwogCiAgICAgYXV0byBjdXJyZW50SXRlbUluZGV4ID0gbmVlZHNMYXlv dXRSYW5nZS5zdGFydDsKICAgICBzaXplX3QgY29tbWl0dGVkSW5saW5lSXRlbUNvdW50ID0gMDsK QEAgLTU0OSw3ICs1NDksNyBAQCBMaW5lQnVpbGRlcjo6VXNlZENvbnN0cmFpbnRzIExpbmVCdWls ZGVyOjppbml0aWFsQ29uc3RyYWludHNGb3JMaW5lKGNvbnN0IElubGluZQogICAgICAgICBhdXRv IHRleHRJbmRlbnQgPSByb290LnN0eWxlKCkudGV4dEluZGVudCgpOwogICAgICAgICBpZiAodGV4 dEluZGVudCA9PSBSZW5kZXJTdHlsZTo6aW5pdGlhbFRleHRJbmRlbnQoKSkKICAgICAgICAgICAg IHJldHVybiB7IH07Ci0gICAgICAgIGlmIChtX2lzSW50cmluc2ljV2lkdGhNb2RlICYmIHRleHRJ bmRlbnQuaXNQZXJjZW50KCkpIHsKKyAgICAgICAgaWYgKGlzSW50cmluc2ljV2lkdGhNb2RlKCkg JiYgdGV4dEluZGVudC5pc1BlcmNlbnQoKSkgewogICAgICAgICAgICAgLy8gUGVyY2VudGFnZXMg bXVzdCBiZSB0cmVhdGVkIGFzIDAgZm9yIHRoZSBwdXJwb3NlIG9mIGNhbGN1bGF0aW5nIGludHJp bnNpYyBzaXplIGNvbnRyaWJ1dGlvbnMuCiAgICAgICAgICAgICAvLyBodHRwczovL2RyYWZ0cy5j c3N3Zy5vcmcvY3NzLXRleHQvI3RleHQtaW5kZW50LXByb3BlcnR5CiAgICAgICAgICAgICByZXR1 cm4geyB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggNTcwZWI1 MjY4MGM3MDJjYTQ4MWM2ZWIzOTgwNjA4ODMxYjQzN2ZiMC4uZDEzNjk2Njc1NzcxYTgyMTE1YWFk ZmFkZTFhY2M0NmQ1NjhjM2UxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRl ci5oCkBAIC0xMTIsNiArMTEyLDggQEAgcHJpdmF0ZToKICAgICBJbmxpbmVMYXlvdXRVbml0IGlu bGluZUl0ZW1XaWR0aChjb25zdCBJbmxpbmVJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50 TG9naWNhbExlZnQpIGNvbnN0OwogICAgIGJvb2wgaXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50 KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbGluZVJhbmdlLCBzaXplX3QgbGFzdElubGluZUl0ZW1J bmRleCwgYm9vbCBoYXNQYXJ0aWFsVHJhaWxpbmdDb250ZW50KSBjb25zdDsKIAorICAgIGJvb2wg aXNJbnRyaW5zaWNXaWR0aE1vZGUoKSBjb25zdCB7IHJldHVybiBtX2lzSW50cmluc2ljV2lkdGhN b2RlOyB9CisKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0dGluZ0Nv bnRleHQoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OyB9CiAgICAg SW5saW5lRm9ybWF0dGluZ1N0YXRlKiBmb3JtYXR0aW5nU3RhdGUoKSB7IHJldHVybiBtX2lubGlu ZUZvcm1hdHRpbmdTdGF0ZTsgfQogICAgIEZsb2F0aW5nU3RhdGUqIGZsb2F0aW5nU3RhdGUoKSB7 IHJldHVybiBtX2Zsb2F0aW5nU3RhdGU7IH0K 444513 2021-11-17 06:36:37 -0800 2021-11-17 07:11:00 -0800 Patch bug-233222-20211117063636.patch text/plain 10591 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFjMzU0YzY2NTYxYzg0 YWE4YWYxMzU4OTNkM2I4YmU3MGVkNzE0MC4uMTVhZDY1N2Q3MDI4ODA5NTYwZjE5ZGZmYzU4NmE2 YzUzZDRjYjQwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTExLTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIGJyZWFrLXdv cmQgaXMgbm90IGNvbnNpZGVyZWQgd2hlbiBjYWxjdWxhdGluZyBtaW4tY29udGVudCBpbnRyaW5z aWMgc2l6ZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzMyMjIKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAg ICBTZWUgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy10ZXh0LyNvdmVyZmxvdy13cmFwLXBy b3BlcnR5CisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVDb250ZW50QnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNv bnRlbnRCcmVha2VyOjpJbmxpbmVDb250ZW50QnJlYWtlcik6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjp3b3JkQnJlYWtCZWhhdmlvciBjb25zdCk6Cisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJy ZWFrZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6 OmlzSW50cmluc2ljV2lkdGhNb2RlIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpwbGFjZUlubGluZUNvbnRlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZSBjb25z dCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmlzSW50 cmluc2ljV2lkdGhNb2RlIGNvbnN0KToKKwogMjAyMS0xMS0xNiAgQWxhbiBCdWp0YXMgIDx6YWxh bkBhcHBsZS5jb20+CiAKICAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25dIENsZWFyIHRoZSBwcmVm ZXJyZWRMb2dpY2FsV2lkdGhzIGRpcnR5IGJpdHMgYWZ0ZXIgY2FsbGluZyBMaW5lTGF5b3V0Ojpj b21wdXRlSW50cmluc2ljV2lkdGhDb25zdHJhaW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lQ29udGVudEJyZWFrZXIuY3BwCmluZGV4IGRhZjhmMjgxNmEwZThmN2U4NjhhZDUyZjM4MzQ0 YTQ2NDNjZmM0OTIuLjVjYjQ5YTYyNjA5YWZjM2MyOGNlYjI2NzFkZmRlMzhkNjRhNzI4Y2QgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTEyNSw2 ICsxMjUsMTEgQEAgc3RhdGljIGlubGluZSBzdGQ6Om9wdGlvbmFsPHNpemVfdD4gZmlyc3RUZXh0 UnVuSW5kZXgoY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXIKICAgICByZXR1cm4geyB9OwogfQog CitJbmxpbmVDb250ZW50QnJlYWtlcjo6SW5saW5lQ29udGVudEJyZWFrZXIoYm9vbCBpc0luSW50 cmluc2ljV2lkdGhNb2RlKQorICAgIDogbV9pc0luSW50cmluc2ljV2lkdGhNb2RlKGlzSW5JbnRy aW5zaWNXaWR0aE1vZGUpCit7Cit9CisKIGJvb2wgSW5saW5lQ29udGVudEJyZWFrZXI6OnNob3Vs ZEtlZXBFbmRPZkxpbmVXaGl0ZXNwYWNlKGNvbnN0IENvbnRpbnVvdXNDb250ZW50JiBjb250aW51 b3VzQ29udGVudCkgY29uc3QKIHsKICAgICAvLyBHcmFiIHRoZSBzdHlsZSBhbmQgY2hlY2sgZm9y IHdoaXRlLXNwYWNlIHByb3BlcnR5IHRvIGRlY2lkZSB3aGV0aGVyIHdlIHNob3VsZCBsZXQgdGhp cyB3aGl0ZXNwYWNlIGNvbnRlbnQgb3ZlcmZsb3cgdGhlIGN1cnJlbnQgbGluZS4KQEAgLTY0Niwx MyArNjUxLDE2IEBAIE9wdGlvblNldDxJbmxpbmVDb250ZW50QnJlYWtlcjo6V29yZEJyZWFrUnVs ZT4gSW5saW5lQ29udGVudEJyZWFrZXI6OndvcmRCcmVha0JlCiAgICAgICAgICAgICByZXR1cm4g KndvcmRCcmVha1J1bGU7CiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfTsKKworICAgIC8vIFNv ZnQgd3JhcCBvcHBvcnR1bml0aWVzIGludHJvZHVjZWQgYnkgYnJlYWstd29yZCBhcmUgbm90IGNv bnNpZGVyZWQgd2hlbiBjYWxjdWxhdGluZyBtaW4tY29udGVudCBpbnRyaW5zaWMgc2l6ZXMuCisg ICAgYXV0byBicmVha1dvcmRJc0FwcGxpY2FibGUgPSAhaXNJbkludHJpbnNpY1dpZHRoTW9kZSgp OwogICAgIC8vIEZvciBjb21wYXRpYmlsaXR5IHdpdGggbGVnYWN5IGNvbnRlbnQsIHRoZSB3b3Jk LWJyZWFrIHByb3BlcnR5IGFsc28gc3VwcG9ydHMgYSBkZXByZWNhdGVkIGJyZWFrLXdvcmQga2V5 d29yZC4KICAgICAvLyBXaGVuIHNwZWNpZmllZCwgdGhpcyBoYXMgdGhlIHNhbWUgZWZmZWN0IGFz IHdvcmQtYnJlYWs6IG5vcm1hbCBhbmQgb3ZlcmZsb3ctd3JhcDogYW55d2hlcmUsIHJlZ2FyZGxl c3Mgb2YgdGhlIGFjdHVhbCB2YWx1ZSBvZiB0aGUgb3ZlcmZsb3ctd3JhcCBwcm9wZXJ0eS4KLSAg ICBpZiAoc3R5bGUud29yZEJyZWFrKCkgPT0gV29yZEJyZWFrOjpCcmVha1dvcmQgJiYgIWhhc1dy YXBPcHBvcnR1bml0eUF0UHJldmlvdXNQb3NpdGlvbikKKyAgICBpZiAoKGJyZWFrV29yZElzQXBw bGljYWJsZSAmJiBzdHlsZS53b3JkQnJlYWsoKSA9PSBXb3JkQnJlYWs6OkJyZWFrV29yZCkgJiYg IWhhc1dyYXBPcHBvcnR1bml0eUF0UHJldmlvdXNQb3NpdGlvbikKICAgICAgICAgcmV0dXJuIGlu Y2x1ZGVIeXBoZW5hdGlvbklmQWxsb3dlZChXb3JkQnJlYWtSdWxlOjpBdEFyYml0cmFyeVBvc2l0 aW9uKTsKICAgICAvLyBPdmVyZmxvd1dyYXA6OkJyZWFrV29yZC9Bbnl3aGVyZSBBbiBvdGhlcndp c2UgdW5icmVha2FibGUgc2VxdWVuY2Ugb2YgY2hhcmFjdGVycyBtYXkgYmUgYnJva2VuIGF0IGFu IGFyYml0cmFyeSBwb2ludCBpZiB0aGVyZSBhcmUgbm8gb3RoZXJ3aXNlLWFjY2VwdGFibGUgYnJl YWsgcG9pbnRzIGluIHRoZSBsaW5lLgogICAgIC8vIE5vdGUgdGhhdCB0aGlzIGFwcGxpZXMgdG8g Y29udGVudCB3aGVyZSBDU1MgcHJvcGVydGllcyAoZS5nLiBXb3JkQnJlYWs6OktlZXBBbGwpIG1h a2UgaXQgdW5icmVha2FibGUuIAotICAgIGlmICgoc3R5bGUub3ZlcmZsb3dXcmFwKCkgPT0gT3Zl cmZsb3dXcmFwOjpCcmVha1dvcmQgfHwgc3R5bGUub3ZlcmZsb3dXcmFwKCkgPT0gT3ZlcmZsb3dX cmFwOjpBbnl3aGVyZSkgJiYgIWhhc1dyYXBPcHBvcnR1bml0eUF0UHJldmlvdXNQb3NpdGlvbikK KyAgICBpZiAoKChicmVha1dvcmRJc0FwcGxpY2FibGUgJiYgc3R5bGUub3ZlcmZsb3dXcmFwKCkg PT0gT3ZlcmZsb3dXcmFwOjpCcmVha1dvcmQpIHx8IHN0eWxlLm92ZXJmbG93V3JhcCgpID09IE92 ZXJmbG93V3JhcDo6QW55d2hlcmUpICYmICFoYXNXcmFwT3Bwb3J0dW5pdHlBdFByZXZpb3VzUG9z aXRpb24pCiAgICAgICAgIHJldHVybiBpbmNsdWRlSHlwaGVuYXRpb25JZkFsbG93ZWQoV29yZEJy ZWFrUnVsZTo6QXRBcmJpdHJhcnlQb3NpdGlvbik7CiAgICAgLy8gQnJlYWtpbmcgaXMgZm9yYmlk ZGVuIHdpdGhpbiDigJx3b3Jkc+KAnS4KICAgICBpZiAoc3R5bGUud29yZEJyZWFrKCkgPT0gV29y ZEJyZWFrOjpLZWVwQWxsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2Vy LmgKaW5kZXggMDlhYWU4YWZlMmVlNjhiNjU1ZWYzNzczNjEzN2FhY2E1MDJiOGM2OC4uOTFiNzQ3 NmQ5NGY1Yjc1ODcwYTRhOGFlOGM1NmU4NjdkZWU3MDQ2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFr ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVDb250ZW50QnJlYWtlci5oCkBAIC0zOCw2ICszOCw4IEBAIHN0cnVjdCBDYW5kaWRh dGVUZXh0UnVuRm9yQnJlYWtpbmc7CiAKIGNsYXNzIElubGluZUNvbnRlbnRCcmVha2VyIHsKIHB1 YmxpYzoKKyAgICBJbmxpbmVDb250ZW50QnJlYWtlcihib29sIGlzSW5JbnRyaW5zaWNXaWR0aE1v ZGUpOworCiAgICAgc3RydWN0IFBhcnRpYWxSdW4gewogICAgICAgICBzaXplX3QgbGVuZ3RoIHsg MCB9OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCB7IDAgfTsKQEAgLTE0 OCw3ICsxNTAsOSBAQCBwcml2YXRlOgogICAgIH07CiAgICAgT3B0aW9uU2V0PFdvcmRCcmVha1J1 bGU+IHdvcmRCcmVha0JlaGF2aW9yKGNvbnN0IFJlbmRlclN0eWxlJiwgYm9vbCBoYXNXcmFwT3Bw b3J0dW5pdHlBdFByZXZpb3VzUG9zaXRpb24pIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkS2VlcEVu ZE9mTGluZVdoaXRlc3BhY2UoY29uc3QgQ29udGludW91c0NvbnRlbnQmKSBjb25zdDsKKyAgICBi b29sIGlzSW5JbnRyaW5zaWNXaWR0aE1vZGUoKSBjb25zdCB7IHJldHVybiBtX2lzSW5JbnRyaW5z aWNXaWR0aE1vZGU7IH0KIAorICAgIGJvb2wgbV9pc0luSW50cmluc2ljV2lkdGhNb2RlIHsgZmFs c2UgfTsKICAgICBib29sIG5faHlwaGVuYXRpb25Jc0Rpc2FibGVkIHsgZmFsc2UgfTsKIH07CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBiNjYxNjAzY2Ri NDYyZWYzMWRmYWI1MDVhOGE2OGIwZmUzMjllOGQ3Li5iMzlmZmM1ZmMyMmNiOWJiYjc4ZDE4MTMw NzZlNGI4YzZiNzJlYjJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu Y3BwCkBAIC0yNjgsOCArMjY4LDggQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQnVpbGRlcjo6aW5s aW5lSXRlbVdpZHRoKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGkKICAgICByZXR1 cm4gYm94R2VvbWV0cnkubWFyZ2luQm94V2lkdGgoKTsKIH0KIAotTGluZUJ1aWxkZXI6OkxpbmVC dWlsZGVyKElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwg RmxvYXRpbmdTdGF0ZSYgZmxvYXRpbmdTdGF0ZSwgSG9yaXpvbnRhbENvbnN0cmFpbnRzIHJvb3RI b3Jpem9udGFsQ29uc3RyYWludHMsIGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcywgSXNJ bnRyaW5zaWNXaWR0aE1vZGUgaXNJbnRyaW5zaWNXaWR0aE1vZGUpCi0gICAgOiBtX2lzSW50cmlu c2ljV2lkdGhNb2RlKGlzSW50cmluc2ljV2lkdGhNb2RlID09IElzSW50cmluc2ljV2lkdGhNb2Rl OjpZZXMpCitMaW5lQnVpbGRlcjo6TGluZUJ1aWxkZXIoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQm IGlubGluZUZvcm1hdHRpbmdDb250ZXh0LCBGbG9hdGluZ1N0YXRlJiBmbG9hdGluZ1N0YXRlLCBI b3Jpem9udGFsQ29uc3RyYWludHMgcm9vdEhvcml6b250YWxDb25zdHJhaW50cywgY29uc3QgSW5s aW5lSXRlbXMmIGlubGluZUl0ZW1zLCBJc0luSW50cmluc2ljV2lkdGhNb2RlIGlzSW5JbnRyaW5z aWNXaWR0aE1vZGUpCisgICAgOiBtX2lzSW5JbnRyaW5zaWNXaWR0aE1vZGUoaXNJbkludHJpbnNp Y1dpZHRoTW9kZSA9PSBJc0luSW50cmluc2ljV2lkdGhNb2RlOjpZZXMpCiAgICAgLCBtX2lubGlu ZUZvcm1hdHRpbmdDb250ZXh0KGlubGluZUZvcm1hdHRpbmdDb250ZXh0KQogICAgICwgbV9pbmxp bmVGb3JtYXR0aW5nU3RhdGUoJmlubGluZUZvcm1hdHRpbmdDb250ZXh0LmZvcm1hdHRpbmdTdGF0 ZSgpKQogICAgICwgbV9mbG9hdGluZ1N0YXRlKCZmbG9hdGluZ1N0YXRlKQpAQCAtMjc5LDggKzI3 OSw4IEBAIExpbmVCdWlsZGVyOjpMaW5lQnVpbGRlcihJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYg aW5saW5lRm9ybWF0dGluZ0NvbnRleHQsIEZsb2F0CiB7CiB9CiAKLUxpbmVCdWlsZGVyOjpMaW5l QnVpbGRlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0Nv bnRleHQsIGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcywgSXNJbnRyaW5zaWNXaWR0aE1v ZGUgaXNJbnRyaW5zaWNXaWR0aE1vZGUpCi0gICAgOiBtX2lzSW50cmluc2ljV2lkdGhNb2RlKGlz SW50cmluc2ljV2lkdGhNb2RlID09IElzSW50cmluc2ljV2lkdGhNb2RlOjpZZXMpCitMaW5lQnVp bGRlcjo6TGluZUJ1aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZv cm1hdHRpbmdDb250ZXh0LCBjb25zdCBJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMsIElzSW5JbnRy aW5zaWNXaWR0aE1vZGUgaXNJbkludHJpbnNpY1dpZHRoTW9kZSkKKyAgICA6IG1faXNJbkludHJp bnNpY1dpZHRoTW9kZShpc0luSW50cmluc2ljV2lkdGhNb2RlID09IElzSW5JbnRyaW5zaWNXaWR0 aE1vZGU6OlllcykKICAgICAsIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQoaW5saW5lRm9ybWF0 dGluZ0NvbnRleHQpCiAgICAgLCBtX2xpbmUoaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpCiAgICAg LCBtX2lubGluZUl0ZW1zKGlubGluZUl0ZW1zKQpAQCAtMzkyLDcgKzM5Miw3IEBAIHZvaWQgTGlu ZUJ1aWxkZXI6OmluaXRpYWxpemUoY29uc3QgVXNlZENvbnN0cmFpbnRzJiBsaW5lQ29uc3RyYWlu dHMsIGJvb2wgaXNGaXJzCiBMaW5lQnVpbGRlcjo6Q29tbWl0dGVkQ29udGVudCBMaW5lQnVpbGRl cjo6cGxhY2VJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRS YW5nZSkKIHsKICAgICBhdXRvIGxpbmVDYW5kaWRhdGUgPSBMaW5lQ2FuZGlkYXRlIHsgbGF5b3V0 U3RhdGUoKS5zaG91bGRJZ25vcmVUcmFpbGluZ0xldHRlclNwYWNpbmcoKSB9OwotICAgIGF1dG8g aW5saW5lQ29udGVudEJyZWFrZXIgPSBJbmxpbmVDb250ZW50QnJlYWtlciB7IH07CisgICAgYXV0 byBpbmxpbmVDb250ZW50QnJlYWtlciA9IElubGluZUNvbnRlbnRCcmVha2VyIHsgaXNJbkludHJp bnNpY1dpZHRoTW9kZSgpIH07CiAKICAgICBhdXRvIGN1cnJlbnRJdGVtSW5kZXggPSBuZWVkc0xh eW91dFJhbmdlLnN0YXJ0OwogICAgIHNpemVfdCBjb21taXR0ZWRJbmxpbmVJdGVtQ291bnQgPSAw OwpAQCAtNTQ5LDcgKzU0OSw3IEBAIExpbmVCdWlsZGVyOjpVc2VkQ29uc3RyYWludHMgTGluZUJ1 aWxkZXI6OmluaXRpYWxDb25zdHJhaW50c0ZvckxpbmUoY29uc3QgSW5saW5lCiAgICAgICAgIGF1 dG8gdGV4dEluZGVudCA9IHJvb3Quc3R5bGUoKS50ZXh0SW5kZW50KCk7CiAgICAgICAgIGlmICh0 ZXh0SW5kZW50ID09IFJlbmRlclN0eWxlOjppbml0aWFsVGV4dEluZGVudCgpKQogICAgICAgICAg ICAgcmV0dXJuIHsgfTsKLSAgICAgICAgaWYgKG1faXNJbnRyaW5zaWNXaWR0aE1vZGUgJiYgdGV4 dEluZGVudC5pc1BlcmNlbnQoKSkgeworICAgICAgICBpZiAoaXNJbkludHJpbnNpY1dpZHRoTW9k ZSgpICYmIHRleHRJbmRlbnQuaXNQZXJjZW50KCkpIHsKICAgICAgICAgICAgIC8vIFBlcmNlbnRh Z2VzIG11c3QgYmUgdHJlYXRlZCBhcyAwIGZvciB0aGUgcHVycG9zZSBvZiBjYWxjdWxhdGluZyBp bnRyaW5zaWMgc2l6ZSBjb250cmlidXRpb25zLgogICAgICAgICAgICAgLy8gaHR0cHM6Ly9kcmFm dHMuY3Nzd2cub3JnL2Nzcy10ZXh0LyN0ZXh0LWluZGVudC1wcm9wZXJ0eQogICAgICAgICAgICAg cmV0dXJuIHsgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oCmluZGV4IDU3 MGViNTI2ODBjNzAyY2E0ODFjNmViMzk4MDYwODgzMWI0MzdmYjAuLmU2ODMwOWE0MzkyMTU5YmU4 ZjUzMTA3ZDA1OWQ3MjZkM2MzNmExNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1 aWxkZXIuaApAQCAtMzksOSArMzksOSBAQCBzdHJ1Y3QgTGluZUNhbmRpZGF0ZTsKIAogY2xhc3Mg TGluZUJ1aWxkZXIgewogcHVibGljOgotICAgIGVudW0gY2xhc3MgSXNJbnRyaW5zaWNXaWR0aE1v ZGUgeyBObywgWWVzIH07Ci0gICAgTGluZUJ1aWxkZXIoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQm LCBGbG9hdGluZ1N0YXRlJiwgSG9yaXpvbnRhbENvbnN0cmFpbnRzIHJvb3RIb3Jpem9udGFsQ29u c3RyYWludHMsIGNvbnN0IElubGluZUl0ZW1zJiwgSXNJbnRyaW5zaWNXaWR0aE1vZGUgPSBJc0lu dHJpbnNpY1dpZHRoTW9kZTo6Tm8pOwotICAgIExpbmVCdWlsZGVyKGNvbnN0IElubGluZUZvcm1h dHRpbmdDb250ZXh0JiwgY29uc3QgSW5saW5lSXRlbXMmLCBJc0ludHJpbnNpY1dpZHRoTW9kZSA9 IElzSW50cmluc2ljV2lkdGhNb2RlOjpZZXMpOworICAgIGVudW0gY2xhc3MgSXNJbkludHJpbnNp Y1dpZHRoTW9kZSB7IE5vLCBZZXMgfTsKKyAgICBMaW5lQnVpbGRlcihJbmxpbmVGb3JtYXR0aW5n Q29udGV4dCYsIEZsb2F0aW5nU3RhdGUmLCBIb3Jpem9udGFsQ29uc3RyYWludHMgcm9vdEhvcml6 b250YWxDb25zdHJhaW50cywgY29uc3QgSW5saW5lSXRlbXMmLCBJc0luSW50cmluc2ljV2lkdGhN b2RlID0gSXNJbkludHJpbnNpY1dpZHRoTW9kZTo6Tm8pOworICAgIExpbmVCdWlsZGVyKGNvbnN0 IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiwgY29uc3QgSW5saW5lSXRlbXMmLCBJc0luSW50cmlu c2ljV2lkdGhNb2RlID0gSXNJbkludHJpbnNpY1dpZHRoTW9kZTo6WWVzKTsKIAogICAgIHN0cnVj dCBJbmxpbmVJdGVtUmFuZ2UgewogICAgICAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVy biBzdGFydCA9PSBlbmQ7IH0KQEAgLTExMiw2ICsxMTIsOCBAQCBwcml2YXRlOgogICAgIElubGlu ZUxheW91dFVuaXQgaW5saW5lSXRlbVdpZHRoKGNvbnN0IElubGluZUl0ZW0mLCBJbmxpbmVMYXlv dXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCkgY29uc3Q7CiAgICAgYm9vbCBpc0xhc3RMaW5lV2l0 aElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBsaW5lUmFuZ2UsIHNpemVfdCBs YXN0SW5saW5lSXRlbUluZGV4LCBib29sIGhhc1BhcnRpYWxUcmFpbGluZ0NvbnRlbnQpIGNvbnN0 OwogCisgICAgYm9vbCBpc0luSW50cmluc2ljV2lkdGhNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9p c0luSW50cmluc2ljV2lkdGhNb2RlOyB9CisKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dCYgZm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUZvcm1hdHRp bmdDb250ZXh0OyB9CiAgICAgSW5saW5lRm9ybWF0dGluZ1N0YXRlKiBmb3JtYXR0aW5nU3RhdGUo KSB7IHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdTdGF0ZTsgfQogICAgIEZsb2F0aW5nU3RhdGUq IGZsb2F0aW5nU3RhdGUoKSB7IHJldHVybiBtX2Zsb2F0aW5nU3RhdGU7IH0KQEAgLTEyMSw3ICsx MjMsNyBAQCBwcml2YXRlOgogCiBwcml2YXRlOgogICAgIGJvb2wgbV9pc0ZpcnN0TGluZSB7IGZh bHNlIH07Ci0gICAgYm9vbCBtX2lzSW50cmluc2ljV2lkdGhNb2RlIHsgZmFsc2UgfTsKKyAgICBi b29sIG1faXNJbkludHJpbnNpY1dpZHRoTW9kZSB7IGZhbHNlIH07CiAgICAgY29uc3QgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQmIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7CiAgICAgSW5saW5l Rm9ybWF0dGluZ1N0YXRlKiBtX2lubGluZUZvcm1hdHRpbmdTdGF0ZSB7IG51bGxwdHIgfTsKICAg ICBGbG9hdGluZ1N0YXRlKiBtX2Zsb2F0aW5nU3RhdGUgeyBudWxscHRyIH07Cg==