232055 2021-10-20 16:31:27 -0700 [LFC][IFC] Add missing isAtSoftWrapOpportunity check when between two whitespace inline items 2021-10-22 08:30:10 -0700 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 1806915 0 zalan 2021-10-20 16:31:27 -0700 e.g. <span> </span><span> </span> with preserved whitespace 1806984 1 441972 zalan 2021-10-20 19:16:22 -0700 Created attachment 441972 Patch 1806989 2 441974 zalan 2021-10-20 19:40:34 -0700 Created attachment 441974 Patch 1807438 3 442087 zalan 2021-10-21 16:48:15 -0700 Created attachment 442087 Patch 1807440 4 442088 zalan 2021-10-21 16:50:02 -0700 Created attachment 442088 Patch with dependencies (webkit.org/b/232091) 1807669 5 ews-feeder 2021-10-22 07:31:12 -0700 Committed r284680 (243400@main): <https://commits.webkit.org/243400@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442087. 1807670 6 webkit-bug-importer 2021-10-22 07:32:17 -0700 <rdar://problem/84548845> 441972 2021-10-20 19:16:22 -0700 2021-10-20 19:40:32 -0700 Patch bug-232055-20211020191621.patch text/plain 7166 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2ZhNTA2YmQzY2EyZTU4 OGNhNTJjYjA2M2VlODQzMWRiZjNhNGQyNy4uNzViNWJkN2QzMjg3MzlhNTg5ZWMyMDhkOTIwMTk4 MzIwZDhiMzhjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTEwLTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgbWlz c2luZyBpc0F0U29mdFdyYXBPcHBvcnR1bml0eSBjaGVjayB3aGVuIGJldHdlZW4gdHdvIHdoaXRl c3BhY2UgaW5saW5lIGl0ZW1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzIwNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBEdWUgdG8gdGhlIGlzV3JhcHBpbmdBbGxvd2VkIGNoZWNrcyBpbiBpc0F0U29m dFdyYXBPcHBvcnR1bml0eSgpIHRvIHNwZWVkIHVwIGxpbmUgYnJlYWtpbmcsCisgICAgICAgIHdl IG1heSBlbmQgdXAgd2l0aCBhZGphY2VudCB3aGl0ZXNwYWNlIGNvbnRlbnQgd2l0aCBkaWZmZXJl bnQgd3JhcHBpbmcgc3R5bGVzIChlbWJlZGRlZCBpbiBkZWRpY2F0ZWQgaW5saW5lIGJveGVzKS4K KyAgICAgICAgZS5nLiA8c3BhbiBzdHlsZT0id2hpdGUtc3BhY2U6IG5vLXdyYXAiPlhYWCA8L3Nw YW4+PHNwYW4gc3R5bGU9IndoaXRlLXNwYWNlOiBub3JtYWwiPiBYPC9zcGFuCisgICAgICAgIElu IHN1Y2ggY2FzZXMsIGl0J3MgYWxzbyBpbnN1ZmZpY2llbnQgdG8gY2hlY2sgdGhlIGZpcnN0IHRl eHQgaW5saW5lIGl0ZW0gZm9yIGlzVmlzdWFsbHlFbXB0eVdoaXRlc3BhY2VDb250ZW50LgorCisg ICAgICAgIFRlc3Q6IGZhc3QvaW5saW5lL3doaXRlLXNwYWNlLW5vd3JhcC1hbmQtbm9ybWFsLWlu bGluZS1ib3guaHRtbAorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojpp c1Zpc3VhbGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eSk6CisKIDIwMjEtMTAtMjAgIFNp aHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHVzZWxlc3Mg ZGVmaW5pdGlvbiBmcm9tIElEQkRhdGFiYXNlLmlkbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lQ29udGVudEJyZWFrZXIuY3BwCmluZGV4IDc2M2NhZDBhMzVkMTQ5OWRlYzRhOGFjYTcyOTI4 YzE2OTM0YjIxMTAuLmIxOWUzMjJmN2RlODc2NWFjZjI4ZTQyOTc4NjhjNDJlYjcyNDE1ZWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTk3LDE1 ICs5NywxNiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNWaXN1YWxseUVtcHR5V2hpdGVzcGFjZUNv bnRlbnQoY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OgogewogICAgIC8vIFs8c3Bhbj48L3Nw YW4+IF0gWzxzcGFuPiA8L3NwYW4+XSBbIDxzcGFuIHN0eWxlPSJwYWRkaW5nOiAwcHg7Ij48L3Nw YW4+XSBhcmUgYWxsIGNvbnNpZGVyZWQgdmlzdWFsbHkgZW1wdHkgd2hpdGVzcGFjZSBjb250ZW50 LgogICAgIC8vIFs8c3BhbiBzdHlsZT0iYm9yZGVyOiAxcHggc29saWQgcmVkIj48L3NwYW4+IF0g d2hpbGUgdGhpcyBpcyB3aGl0ZXNwYWNlIGNvbnRlbnQgb25seSwgaXQgaXMgbm90IGNvbnNpZGVy ZWQgdmlzdWFsbHkgZW1wdHkuCi0gICAgLy8gRHVlIHRvIGNvbW1pdCBib3VuZGFyeSBydWxlcywg d2UganVzdCBuZWVkIHRvIGNoZWNrIHRoZSBmaXJzdCBub24tdHlwZWxlc3MgaW5saW5lIGl0ZW0g KGNhbid0IGhhdmUgYm90aCBbaW1nXSBhbmQgW3RleHRdKQorICAgIEFTU0VSVCghY29udGludW91 c0NvbnRlbnQucnVucygpLmlzRW1wdHkoKSk7CiAgICAgZm9yIChhdXRvJiBydW4gOiBjb250aW51 b3VzQ29udGVudC5ydW5zKCkpIHsKICAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9IHJ1bi5pbmxp bmVJdGVtOwotICAgICAgICAvLyBGSVhNRTogY2hlY2sgZm9yIHBhZGRpbmcgYm9yZGVyIGV0Yy4K KyAgICAgICAgLy8gRklYTUU6IGNoZWNrIGlmIHZpc3VhbCBkZWNvcmF0aW9uIG1ha2VzIGEgZGlm ZmVyZW5jZSBoZXJlIGUuZy4gcGFkZGluZyBib3JkZXIuCiAgICAgICAgIGlmIChpbmxpbmVJdGVt LmlzSW5saW5lQm94U3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzSW5saW5lQm94RW5kKCkpCiAgICAg ICAgICAgICBjb250aW51ZTsKLSAgICAgICAgcmV0dXJuIGlubGluZUl0ZW0uaXNUZXh0KCkgJiYg ZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pLmlzV2hpdGVzcGFjZSgpOworICAg ICAgICBpZiAoIWlubGluZUl0ZW0uaXNUZXh0KCkgfHwgKGlubGluZUl0ZW0uaXNUZXh0KCkgJiYg IWRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKS5pc1doaXRlc3BhY2UoKSkpCisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotICAgIHJldHVybiBmYWxzZTsKKyAgICBy ZXR1cm4gdHJ1ZTsKIH0KIAogc3RhdGljIGlubGluZSBib29sIGlzTm9uQ29udGVudFJ1bnNPbmx5 KGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudCYgY29udGludW91 c0NvbnRlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXgg NzEwYTgxZmJjYTE3NWJhOTI2YTc5ZjEwMDhhN2QzZmMwMzhhOGRhYS4uZWI5ZWEwYmI0YWFkNDRj MjMyMGExYTcxZGMwNGMzMjhjMjVjMGZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCdWlsZGVyLmNwcApAQCAtOTIsMTIgKzkyLDE2IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0F0 U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5l CiAgICAgaWYgKGN1cnJlbnQuaXNUZXh0KCkgJiYgbmV4dC5pc1RleHQoKSkgewogICAgICAgICBh dXRvJiBjdXJyZW50SW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oY3Vy cmVudCk7CiAgICAgICAgIGF1dG8mIG5leHRJbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGlu ZVRleHRJdGVtPihuZXh0KTsKKyAgICAgICAgaWYgKGN1cnJlbnRJbmxpbmVUZXh0SXRlbS5pc1do aXRlc3BhY2UoKSAmJiBuZXh0SW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpIHsKKyAgICAg ICAgICAgIC8vIDxzcGFuPiA8L3NwYW4+PHNwYW4+IDwvc3Bhbj4uIERlcGVuZGluZyBvbiB0aGUg c3R5bGVzLCB0aGVyZSBtYXkgb3IgbWF5IG5vdCBiZSBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eSBi ZXR3ZWVuIHRoZXNlIDIgd2hpdGVzcGFjZSBjb250ZW50LgorICAgICAgICAgICAgcmV0dXJuIFRl eHRVdGlsOjppc1dyYXBwaW5nQWxsb3dlZChjdXJyZW50SW5saW5lVGV4dEl0ZW0uc3R5bGUoKSkg fHwgVGV4dFV0aWw6OmlzV3JhcHBpbmdBbGxvd2VkKG5leHRJbmxpbmVUZXh0SXRlbS5zdHlsZSgp KTsKKyAgICAgICAgfQogICAgICAgICBpZiAoY3VycmVudElubGluZVRleHRJdGVtLmlzV2hpdGVz cGFjZSgpKSB7Ci0gICAgICAgICAgICAvLyBbIF1bdGV4dF0gOiBhZnRlciBbd2hpdGVzcGFjZV0g cG9zaXRpb24gaXMgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkuCisgICAgICAgICAgICAvLyAiIDxz cGFuPnRleHQ8L3NwYW4+IiA6IGFmdGVyIFt3aGl0ZXNwYWNlXSBwb3NpdGlvbiBpcyBhIHNvZnQg d3JhcCBvcHBvcnR1bml0eS4KICAgICAgICAgICAgIHJldHVybiBUZXh0VXRpbDo6aXNXcmFwcGlu Z0FsbG93ZWQoY3VycmVudElubGluZVRleHRJdGVtLnN0eWxlKCkpOwogICAgICAgICB9CiAgICAg ICAgIGlmIChuZXh0SW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpIHsKLSAgICAgICAgICAg IC8vIFt0ZXh0XVsgXSAoPHNwYW4+dGV4dDwvc3Bhbj4gKQorICAgICAgICAgICAgLy8gIjxzcGFu PnRleHQ8L3NwYW4+ICIKICAgICAgICAgICAgIC8vIHdoaXRlLXNwYWNlOiBicmVhay1zcGFjZXM6 IGxpbmUgYnJlYWtpbmcgb3Bwb3J0dW5pdHkgZXhpc3RzIGFmdGVyIGV2ZXJ5IHByZXNlcnZlZCB3 aGl0ZSBzcGFjZSBjaGFyYWN0ZXIsIGJ1dCBub3QgYmVmb3JlLgogICAgICAgICAgICAgcmV0dXJu IFRleHRVdGlsOjppc1dyYXBwaW5nQWxsb3dlZChuZXh0SW5saW5lVGV4dEl0ZW0uc3R5bGUoKSkg JiYgbmV4dElubGluZVRleHRJdGVtLnN0eWxlKCkud2hpdGVTcGFjZSgpICE9IFdoaXRlU3BhY2U6 OkJyZWFrU3BhY2VzOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNzY5ZGExOTgzOTZmNGQ5NmQzNmIzMGRh YmMyMDEwYWMwZjg2ZGY5ZC4uYmM4MzgwMzkzNDNiMDRmOWNmZDYxZDY3ODc1ZDNiYzU2OWRmYjk2 YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTEwLTIwICBaYWxhbiBCdWp0YXMgIDx6YWxh bkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgbWlzc2luZyBpc0F0U29mdFdy YXBPcHBvcnR1bml0eSBjaGVjayB3aGVuIGJldHdlZW4gdHdvIHdoaXRlc3BhY2UgaW5saW5lIGl0 ZW1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIw NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZh c3QvaW5saW5lL3doaXRlLXNwYWNlLW5vd3JhcC1hbmQtbm9ybWFsLWlubGluZS1ib3gtZXhwZWN0 ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9pbmxpbmUvd2hpdGUtc3BhY2Utbm93cmFw LWFuZC1ub3JtYWwtaW5saW5lLWJveC5odG1sOiBBZGRlZC4KKwogMjAyMS0xMC0yMCAgRXJpYyBI dXRjaGlzb24gIDxlaHV0Y2hpc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbIGlPUzE1IGdwdXBy b2Nlc3MgXSAyIGNzcy9jb2xvci1maWx0ZXIgdGVzdHMgYXJlIGltYWdlLW9ubHkgZmFpbGluZy4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3doaXRlLXNwYWNlLW5vd3JhcC1h bmQtbm9ybWFsLWlubGluZS1ib3gtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5s aW5lL3doaXRlLXNwYWNlLW5vd3JhcC1hbmQtbm9ybWFsLWlubGluZS1ib3gtZXhwZWN0ZWQuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5hYzgxZjFjZDJjY2FjMWZjMDgxNzlhNzc3NmViMzU5NDE5YTUwZWMyCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvd2hpdGUtc3BhY2Utbm93 cmFwLWFuZC1ub3JtYWwtaW5saW5lLWJveC1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTAgQEAK KzwhRE9DVFlQRSBodG1sPgorPHN0eWxlPgorZGl2IHsKKyAgZm9udDogMjBweC8xIEFoZW07Cisg IHdpZHRoOiAyMDBweDsKKyAgY29sb3I6IGdyZWVuOworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVl bjsKK30KKzwvc3R5bGU+Cis8ZGl2Pjxicj48YnI+PC9kaXY+CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2lubGluZS93aGl0ZS1zcGFjZS1ub3dyYXAtYW5kLW5vcm1hbC1pbmxpbmUtYm94 Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS93aGl0ZS1zcGFjZS1ub3dyYXAtYW5kLW5v cm1hbC1pbmxpbmUtYm94Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNGQzYjQ5NGJkODcwMWQxNzA0NzY0YjNi MmU0MmE1NzA0Mjc3NTFiOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5s aW5lL3doaXRlLXNwYWNlLW5vd3JhcC1hbmQtbm9ybWFsLWlubGluZS1ib3guaHRtbApAQCAtMCww ICsxLDI4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KK2RpdiB7CisgIGZvbnQ6IDIwcHgv MSBBaGVtOworfQorCisjcmVkIHsKKyAgcG9zaXRpb246IGFic29sdXRlOworICB6LWluZGV4OiAt MTsKKyAgYmFja2dyb3VuZDogcmVkOworICBjb2xvcjogdHJhbnNwYXJlbnQ7Cit9CisKKy50ZXN0 IHsKKyAgd2lkdGg6IDIwMHB4OworICBjb2xvcjogZ3JlZW47CisgIGJhY2tncm91bmQtY29sb3I6 IGdyZWVuOworfQorLm5vcm1hbCB7CisgIHdoaXRlLXNwYWNlOiBub3JtYWw7Cit9Cisubm93cmFw IHsKKyAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKK30KKzwvc3R5bGU+Cis8IS0tIHdoaXRlLXNwYWNl OiBub3JtYWwgYWxsb3dzIHdyYXBwaW5nIGF0IHRoZSBvdmVyZmxvd2luZyB3aGl0ZXNwYWNlIGNv bnRlbnQgLS0+Cis8ZGl2IGlkPXJlZD5YWFhYWFhYWFhYPGJyPlg8L2Rpdj4KKzxkaXYgY2xhc3M9 InRlc3Qgbm93cmFwIj48c3BhbiBjbGFzcz0ibm93cmFwIj5YWFhYWFhYWFhYIDwvc3Bhbj48c3Bh biBjbGFzcz0ibm9ybWFsIj4gPC9zcGFuPiBYPC9zcGFuPjwvZGl2Pgo= 441974 2021-10-20 19:40:34 -0700 2021-10-21 16:48:13 -0700 Patch bug-232055-20211020194033.patch text/plain 7255 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNThmMmU0NjhkM2UxN2Uw NDNkNWU3M2NkMTcyMzZmNTAyNTcxNWVkMC4uOTM2MjEzMDBlMGZmZGUzZTE0MzM5N2U1YTkwZjdm ZTFjZWRmZjIzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTEwLTIwICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBtaXNz aW5nIGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5IGNoZWNrIHdoZW4gYmV0d2VlbiB0d28gd2hpdGVz cGFjZSBpbmxpbmUgaXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzMjA1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIER1ZSB0byB0aGUgaXNXcmFwcGluZ0FsbG93ZWQgY2hlY2tzIGluIGlzQXRTb2Z0 V3JhcE9wcG9ydHVuaXR5KCkgdG8gc3BlZWQgdXAgbGluZSBicmVha2luZywKKyAgICAgICAgd2Ug bWF5IGVuZCB1cCB3aXRoIGFkamFjZW50IHdoaXRlc3BhY2UgY29udGVudCB3aXRoIGRpZmZlcmVu dCB3cmFwcGluZyBzdHlsZXMgKGVtYmVkZGVkIGluIGRlZGljYXRlZCBpbmxpbmUgYm94ZXMpLgor ICAgICAgICBlLmcuIDxzcGFuIHN0eWxlPSJ3aGl0ZS1zcGFjZTogbm8td3JhcCI+WFhYIDwvc3Bh bj48c3BhbiBzdHlsZT0id2hpdGUtc3BhY2U6IG5vcm1hbCI+IFg8L3NwYW4KKyAgICAgICAgSW4g c3VjaCBjYXNlcywgaXQncyBhbHNvIGluc3VmZmljaWVudCB0byBjaGVjayB0aGUgZmlyc3QgdGV4 dCBpbmxpbmUgaXRlbSBmb3IgaXNWaXN1YWxseUVtcHR5V2hpdGVzcGFjZUNvbnRlbnQuCisKKyAg ICAgICAgVGVzdDogZmFzdC9pbmxpbmUvd2hpdGUtc3BhY2Utbm93cmFwLWFuZC1ub3JtYWwtaW5s aW5lLWJveC5odG1sCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Omlz VmlzdWFsbHlFbXB0eVdoaXRlc3BhY2VDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OmlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KToKKwogMjAyMS0xMC0yMCAgQmV0 aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+IGFuZCBEYW5hIEVzdHJhIDxkZXN0cmFAYXBwbGUu Y29tPgogCiAgICAgICAgIG1hY09TIGtleS1kcml2ZW4gc21vb3RoIHNjcm9sbGluZyBkb2VzIG5v dCBzdG9wIHdoZW4gZm9jdXMgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29u dGVudEJyZWFrZXIuY3BwCmluZGV4IDc2M2NhZDBhMzVkMTQ5OWRlYzRhOGFjYTcyOTI4YzE2OTM0 YjIxMTAuLmIxOWUzMjJmN2RlODc2NWFjZjI4ZTQyOTc4NjhjNDJlYjcyNDE1ZWIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUNvbnRlbnRCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTk3LDE1ICs5Nywx NiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNWaXN1YWxseUVtcHR5V2hpdGVzcGFjZUNvbnRlbnQo Y29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OgogewogICAgIC8vIFs8c3Bhbj48L3NwYW4+IF0g WzxzcGFuPiA8L3NwYW4+XSBbIDxzcGFuIHN0eWxlPSJwYWRkaW5nOiAwcHg7Ij48L3NwYW4+XSBh cmUgYWxsIGNvbnNpZGVyZWQgdmlzdWFsbHkgZW1wdHkgd2hpdGVzcGFjZSBjb250ZW50LgogICAg IC8vIFs8c3BhbiBzdHlsZT0iYm9yZGVyOiAxcHggc29saWQgcmVkIj48L3NwYW4+IF0gd2hpbGUg dGhpcyBpcyB3aGl0ZXNwYWNlIGNvbnRlbnQgb25seSwgaXQgaXMgbm90IGNvbnNpZGVyZWQgdmlz dWFsbHkgZW1wdHkuCi0gICAgLy8gRHVlIHRvIGNvbW1pdCBib3VuZGFyeSBydWxlcywgd2UganVz dCBuZWVkIHRvIGNoZWNrIHRoZSBmaXJzdCBub24tdHlwZWxlc3MgaW5saW5lIGl0ZW0gKGNhbid0 IGhhdmUgYm90aCBbaW1nXSBhbmQgW3RleHRdKQorICAgIEFTU0VSVCghY29udGludW91c0NvbnRl bnQucnVucygpLmlzRW1wdHkoKSk7CiAgICAgZm9yIChhdXRvJiBydW4gOiBjb250aW51b3VzQ29u dGVudC5ydW5zKCkpIHsKICAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9IHJ1bi5pbmxpbmVJdGVt OwotICAgICAgICAvLyBGSVhNRTogY2hlY2sgZm9yIHBhZGRpbmcgYm9yZGVyIGV0Yy4KKyAgICAg ICAgLy8gRklYTUU6IGNoZWNrIGlmIHZpc3VhbCBkZWNvcmF0aW9uIG1ha2VzIGEgZGlmZmVyZW5j ZSBoZXJlIGUuZy4gcGFkZGluZyBib3JkZXIuCiAgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzSW5s aW5lQm94U3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzSW5saW5lQm94RW5kKCkpCiAgICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgcmV0dXJuIGlubGluZUl0ZW0uaXNUZXh0KCkgJiYgZG93bmNh c3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pLmlzV2hpdGVzcGFjZSgpOworICAgICAgICBp ZiAoIWlubGluZUl0ZW0uaXNUZXh0KCkgfHwgKGlubGluZUl0ZW0uaXNUZXh0KCkgJiYgIWRvd25j YXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKS5pc1doaXRlc3BhY2UoKSkpCisgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4g dHJ1ZTsKIH0KIAogc3RhdGljIGlubGluZSBib29sIGlzTm9uQ29udGVudFJ1bnNPbmx5KGNvbnN0 IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudCYgY29udGludW91c0NvbnRl bnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggNzEwYTgx ZmJjYTE3NWJhOTI2YTc5ZjEwMDhhN2QzZmMwMzhhOGRhYS4uZWI5ZWEwYmI0YWFkNDRjMjMyMGEx YTcxZGMwNGMzMjhjMjVjMGZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWls ZGVyLmNwcApAQCAtOTIsMTIgKzkyLDE2IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0F0U29mdFdy YXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5lCiAgICAg aWYgKGN1cnJlbnQuaXNUZXh0KCkgJiYgbmV4dC5pc1RleHQoKSkgewogICAgICAgICBhdXRvJiBj dXJyZW50SW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oY3VycmVudCk7 CiAgICAgICAgIGF1dG8mIG5leHRJbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJ dGVtPihuZXh0KTsKKyAgICAgICAgaWYgKGN1cnJlbnRJbmxpbmVUZXh0SXRlbS5pc1doaXRlc3Bh Y2UoKSAmJiBuZXh0SW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpIHsKKyAgICAgICAgICAg IC8vIDxzcGFuPiA8L3NwYW4+PHNwYW4+IDwvc3Bhbj4uIERlcGVuZGluZyBvbiB0aGUgc3R5bGVz LCB0aGVyZSBtYXkgb3IgbWF5IG5vdCBiZSBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eSBiZXR3ZWVu IHRoZXNlIDIgd2hpdGVzcGFjZSBjb250ZW50LgorICAgICAgICAgICAgcmV0dXJuIFRleHRVdGls Ojppc1dyYXBwaW5nQWxsb3dlZChjdXJyZW50SW5saW5lVGV4dEl0ZW0uc3R5bGUoKSkgfHwgVGV4 dFV0aWw6OmlzV3JhcHBpbmdBbGxvd2VkKG5leHRJbmxpbmVUZXh0SXRlbS5zdHlsZSgpKTsKKyAg ICAgICAgfQogICAgICAgICBpZiAoY3VycmVudElubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgp KSB7Ci0gICAgICAgICAgICAvLyBbIF1bdGV4dF0gOiBhZnRlciBbd2hpdGVzcGFjZV0gcG9zaXRp b24gaXMgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkuCisgICAgICAgICAgICAvLyAiIDxzcGFuPnRl eHQ8L3NwYW4+IiA6IGFmdGVyIFt3aGl0ZXNwYWNlXSBwb3NpdGlvbiBpcyBhIHNvZnQgd3JhcCBv cHBvcnR1bml0eS4KICAgICAgICAgICAgIHJldHVybiBUZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93 ZWQoY3VycmVudElubGluZVRleHRJdGVtLnN0eWxlKCkpOwogICAgICAgICB9CiAgICAgICAgIGlm IChuZXh0SW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpIHsKLSAgICAgICAgICAgIC8vIFt0 ZXh0XVsgXSAoPHNwYW4+dGV4dDwvc3Bhbj4gKQorICAgICAgICAgICAgLy8gIjxzcGFuPnRleHQ8 L3NwYW4+ICIKICAgICAgICAgICAgIC8vIHdoaXRlLXNwYWNlOiBicmVhay1zcGFjZXM6IGxpbmUg YnJlYWtpbmcgb3Bwb3J0dW5pdHkgZXhpc3RzIGFmdGVyIGV2ZXJ5IHByZXNlcnZlZCB3aGl0ZSBz cGFjZSBjaGFyYWN0ZXIsIGJ1dCBub3QgYmVmb3JlLgogICAgICAgICAgICAgcmV0dXJuIFRleHRV dGlsOjppc1dyYXBwaW5nQWxsb3dlZChuZXh0SW5saW5lVGV4dEl0ZW0uc3R5bGUoKSkgJiYgbmV4 dElubGluZVRleHRJdGVtLnN0eWxlKCkud2hpdGVTcGFjZSgpICE9IFdoaXRlU3BhY2U6OkJyZWFr U3BhY2VzOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZmM3ZmE3MTc1NWY5OTI5ZWM2YzNiZjc4MTlkMTU5 NDc5MDJlNzlmNC4uMmViMjUyMjFkZmNkMjFiNzU0ZjU1OTBjM2M4ZjNmZjJmZWIxY2U2NyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTEwLTIwICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBtaXNzaW5nIGlzQXRTb2Z0V3JhcE9wcG9y dHVuaXR5IGNoZWNrIHdoZW4gYmV0d2VlbiB0d28gd2hpdGVzcGFjZSBpbmxpbmUgaXRlbXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjA1NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9pbmxp bmUvd2hpdGUtc3BhY2Utbm93cmFwLWFuZC1ub3JtYWwtaW5saW5lLWJveC1leHBlY3RlZC5odG1s OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2lubGluZS93aGl0ZS1zcGFjZS1ub3dyYXAtYW5kLW5v cm1hbC1pbmxpbmUtYm94Lmh0bWw6IEFkZGVkLgorCiAyMDIxLTEwLTIwICBBeXVtaSBLb2ppbWEg IDxheXVtaV9rb2ppbWFAYXBwbGUuY29tPgogCiAgICAgICAgIFsgbWFjT1MgXSBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3hoci9ldmVudC11cGxvYWQtcHJvZ3Jlc3MtY3Jvc3Nvcmln aW4uYW55Lmh0bWwgaXMgYSBmbGFreSBmYWlsdXJlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9pbmxpbmUvd2hpdGUtc3BhY2Utbm93cmFwLWFuZC1ub3JtYWwtaW5saW5lLWJveC1leHBl Y3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvd2hpdGUtc3BhY2Utbm93cmFwLWFu ZC1ub3JtYWwtaW5saW5lLWJveC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFjODFmMWNkMmNj YWMxZmMwODE3OWE3Nzc2ZWIzNTk0MTlhNTBlYzIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9mYXN0L2lubGluZS93aGl0ZS1zcGFjZS1ub3dyYXAtYW5kLW5vcm1hbC1pbmxpbmUtYm94 LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxMCBAQAorPCFET0NUWVBFIGh0bWw+Cis8c3R5bGU+ CitkaXYgeworICBmb250OiAyMHB4LzEgQWhlbTsKKyAgd2lkdGg6IDIwMHB4OworICBjb2xvcjog Z3JlZW47CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzxkaXY+PGJy Pjxicj48L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3doaXRlLXNw YWNlLW5vd3JhcC1hbmQtbm9ybWFsLWlubGluZS1ib3guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv aW5saW5lL3doaXRlLXNwYWNlLW5vd3JhcC1hbmQtbm9ybWFsLWlubGluZS1ib3guaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi40ZDNiNDk0YmQ4NzAxZDE3MDQ3NjRiM2IyZTQyYTU3MDQyNzc1MWI4Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvd2hpdGUtc3BhY2Utbm93cmFwLWFu ZC1ub3JtYWwtaW5saW5lLWJveC5odG1sCkBAIC0wLDAgKzEsMjggQEAKKzwhRE9DVFlQRSBodG1s PgorPHN0eWxlPgorZGl2IHsKKyAgZm9udDogMjBweC8xIEFoZW07Cit9CisKKyNyZWQgeworICBw b3NpdGlvbjogYWJzb2x1dGU7CisgIHotaW5kZXg6IC0xOworICBiYWNrZ3JvdW5kOiByZWQ7Cisg IGNvbG9yOiB0cmFuc3BhcmVudDsKK30KKworLnRlc3QgeworICB3aWR0aDogMjAwcHg7CisgIGNv bG9yOiBncmVlbjsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9Cisubm9ybWFsIHsKKyAg d2hpdGUtc3BhY2U6IG5vcm1hbDsKK30KKy5ub3dyYXAgeworICB3aGl0ZS1zcGFjZTogbm93cmFw OworfQorPC9zdHlsZT4KKzwhLS0gd2hpdGUtc3BhY2U6IG5vcm1hbCBhbGxvd3Mgd3JhcHBpbmcg YXQgdGhlIG92ZXJmbG93aW5nIHdoaXRlc3BhY2UgY29udGVudCAtLT4KKzxkaXYgaWQ9cmVkPlhY WFhYWFhYWFg8YnI+WDwvZGl2PgorPGRpdiBjbGFzcz0idGVzdCBub3dyYXAiPjxzcGFuIGNsYXNz PSJub3dyYXAiPlhYWFhYWFhYWFggPC9zcGFuPjxzcGFuIGNsYXNzPSJub3JtYWwiPiA8L3NwYW4+ IFg8L3NwYW4+PC9kaXY+Cg== 442087 2021-10-21 16:48:15 -0700 2021-10-22 08:30:10 -0700 Patch bug-232055-20211021164814.patch text/plain 5566 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM1NDNhZjk1MDgyNDBm M2ViNTI0ZjQ2ZTI4MTBmNTFlYjY5ZGRmMS4uZTI4NzJjZmExOWYyNjA1ZWNmNmQyNTE5NzVkMjFl NWNiZTI2ZjE2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEwLTIxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBtaXNz aW5nIGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5IGNoZWNrIHdoZW4gYmV0d2VlbiB0d28gd2hpdGVz cGFjZSBpbmxpbmUgaXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzMjA1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIER1ZSB0byB0aGUgaXNXcmFwcGluZ0FsbG93ZWQgY2hlY2tzIGluIGlzQXRTb2Z0 V3JhcE9wcG9ydHVuaXR5KCkgdG8gc3BlZWQgdXAgbGluZSBicmVha2luZywKKyAgICAgICAgd2Ug bWF5IGVuZCB1cCB3aXRoIGFkamFjZW50IHdoaXRlc3BhY2UgY29udGVudCB3aXRoIGRpZmZlcmVu dCB3cmFwcGluZyBzdHlsZXMgKGVtYmVkZGVkIGluIHNlcGFyYXRlIGlubGluZSBib3hlcykuCisg ICAgICAgIGUuZy4gPHNwYW4gc3R5bGU9IndoaXRlLXNwYWNlOiBuby13cmFwIj5YWFggPC9zcGFu PjxzcGFuIHN0eWxlPSJ3aGl0ZS1zcGFjZTogbm9ybWFsIj4gWDwvc3BhbgorCisgICAgICAgIFRl c3Q6IGZhc3QvaW5saW5lL3doaXRlLXNwYWNlLW5vd3JhcC1hbmQtbm9ybWFsLWlubGluZS1ib3gu aHRtbAorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l Q29udGVudEJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc1Zpc3VhbGx5 RW1wdHlXaGl0ZXNwYWNlQ29udGVudCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eSk6CisKIDIwMjEtMTAtMjEgIEFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9y IGNoZWNraW5nIGxlYWRpbmcgY29sbGFwc2libGUgd2hpdGVzcGFjZSBpbiBJbmxpbmVDb250ZW50 QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDcxMGE4MWZiY2ExNzViYTkyNmE3OWYxMDA4YTdkM2Zj MDM4YThkYWEuLmViOWVhMGJiNGFhZDQ0YzIzMjBhMWE3MWRjMDRjMzI4YzI1YzBmZmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTkyLDEyICs5MiwxNiBA QCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQmIGlubGluZQogICAgIGlmIChjdXJyZW50LmlzVGV4dCgpICYmIG5l eHQuaXNUZXh0KCkpIHsKICAgICAgICAgYXV0byYgY3VycmVudElubGluZVRleHRJdGVtID0gZG93 bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGN1cnJlbnQpOwogICAgICAgICBhdXRvJiBuZXh0SW5saW5l VGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4obmV4dCk7CisgICAgICAgIGlmIChj dXJyZW50SW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkgJiYgbmV4dElubGluZVRleHRJdGVt LmlzV2hpdGVzcGFjZSgpKSB7CisgICAgICAgICAgICAvLyA8c3Bhbj4gPC9zcGFuPjxzcGFuPiA8 L3NwYW4+LiBEZXBlbmRpbmcgb24gdGhlIHN0eWxlcywgdGhlcmUgbWF5IG9yIG1heSBub3QgYmUg YSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkgYmV0d2VlbiB0aGVzZSAyIHdoaXRlc3BhY2UgY29udGVu dC4KKyAgICAgICAgICAgIHJldHVybiBUZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQoY3VycmVu dElubGluZVRleHRJdGVtLnN0eWxlKCkpIHx8IFRleHRVdGlsOjppc1dyYXBwaW5nQWxsb3dlZChu ZXh0SW5saW5lVGV4dEl0ZW0uc3R5bGUoKSk7CisgICAgICAgIH0KICAgICAgICAgaWYgKGN1cnJl bnRJbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSkgewotICAgICAgICAgICAgLy8gWyBdW3Rl eHRdIDogYWZ0ZXIgW3doaXRlc3BhY2VdIHBvc2l0aW9uIGlzIGEgc29mdCB3cmFwIG9wcG9ydHVu aXR5LgorICAgICAgICAgICAgLy8gIiA8c3Bhbj50ZXh0PC9zcGFuPiIgOiBhZnRlciBbd2hpdGVz cGFjZV0gcG9zaXRpb24gaXMgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkuCiAgICAgICAgICAgICBy ZXR1cm4gVGV4dFV0aWw6OmlzV3JhcHBpbmdBbGxvd2VkKGN1cnJlbnRJbmxpbmVUZXh0SXRlbS5z dHlsZSgpKTsKICAgICAgICAgfQogICAgICAgICBpZiAobmV4dElubGluZVRleHRJdGVtLmlzV2hp dGVzcGFjZSgpKSB7Ci0gICAgICAgICAgICAvLyBbdGV4dF1bIF0gKDxzcGFuPnRleHQ8L3NwYW4+ ICkKKyAgICAgICAgICAgIC8vICI8c3Bhbj50ZXh0PC9zcGFuPiAiCiAgICAgICAgICAgICAvLyB3 aGl0ZS1zcGFjZTogYnJlYWstc3BhY2VzOiBsaW5lIGJyZWFraW5nIG9wcG9ydHVuaXR5IGV4aXN0 cyBhZnRlciBldmVyeSBwcmVzZXJ2ZWQgd2hpdGUgc3BhY2UgY2hhcmFjdGVyLCBidXQgbm90IGJl Zm9yZS4KICAgICAgICAgICAgIHJldHVybiBUZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQobmV4 dElubGluZVRleHRJdGVtLnN0eWxlKCkpICYmIG5leHRJbmxpbmVUZXh0SXRlbS5zdHlsZSgpLndo aXRlU3BhY2UoKSAhPSBXaGl0ZVNwYWNlOjpCcmVha1NwYWNlczsKICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDliMDk2MWIyNWQyOWFmNjlmNzFkNzczZTE3M2QzNjU1NWMwMjU4ZDcuLjg5NTVlNDFkMGJlYTAz NTQ4NGFhOGQ3ZTRlZjc2OWEzZDQ0YTI0ZGUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0x MC0yMSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZD XSBBZGQgbWlzc2luZyBpc0F0U29mdFdyYXBPcHBvcnR1bml0eSBjaGVjayB3aGVuIGJldHdlZW4g dHdvIHdoaXRlc3BhY2UgaW5saW5lIGl0ZW1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvaW5saW5lL3doaXRlLXNwYWNlLW5vd3JhcC1hbmQt bm9ybWFsLWlubGluZS1ib3gtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9p bmxpbmUvd2hpdGUtc3BhY2Utbm93cmFwLWFuZC1ub3JtYWwtaW5saW5lLWJveC5odG1sOiBBZGRl ZC4KKwogMjAyMS0xMC0yMSAgQXl1bWkgS29qaW1hICA8YXl1bWlfa29qaW1hQGFwcGxlLmNvbT4K IAogICAgICAgICBSZWdyZXNzaW9uKHIyODQ0MzkpOiBbIGlQYWQgXSBmYXN0L2NhbnZhcy9jYW52 YXMtY3JlYXRlUGF0dGVybi12aWRlby1sb2FkaW5nLmh0bWwgYW5kIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxlbWVudC9tYW51YWwvaW1hZ2ViaXRtYXAvY2Fu dmFzLWNyZWF0ZUltYWdlQml0bWFwLXZpZGVvLXJlc2l6ZS5odG1sIGFyZSBmYWlsaW5nLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvd2hpdGUtc3BhY2Utbm93cmFwLWFuZC1u b3JtYWwtaW5saW5lLWJveC1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUv d2hpdGUtc3BhY2Utbm93cmFwLWFuZC1ub3JtYWwtaW5saW5lLWJveC1leHBlY3RlZC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLmFjODFmMWNkMmNjYWMxZmMwODE3OWE3Nzc2ZWIzNTk0MTlhNTBlYzIKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS93aGl0ZS1zcGFjZS1ub3dyYXAt YW5kLW5vcm1hbC1pbmxpbmUtYm94LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxMCBAQAorPCFE T0NUWVBFIGh0bWw+Cis8c3R5bGU+CitkaXYgeworICBmb250OiAyMHB4LzEgQWhlbTsKKyAgd2lk dGg6IDIwMHB4OworICBjb2xvcjogZ3JlZW47CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOwor fQorPC9zdHlsZT4KKzxkaXY+PGJyPjxicj48L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvaW5saW5lL3doaXRlLXNwYWNlLW5vd3JhcC1hbmQtbm9ybWFsLWlubGluZS1ib3guaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3doaXRlLXNwYWNlLW5vd3JhcC1hbmQtbm9ybWFs LWlubGluZS1ib3guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40ZDNiNDk0YmQ4NzAxZDE3MDQ3NjRiM2IyZTQy YTU3MDQyNzc1MWI4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUv d2hpdGUtc3BhY2Utbm93cmFwLWFuZC1ub3JtYWwtaW5saW5lLWJveC5odG1sCkBAIC0wLDAgKzEs MjggQEAKKzwhRE9DVFlQRSBodG1sPgorPHN0eWxlPgorZGl2IHsKKyAgZm9udDogMjBweC8xIEFo ZW07Cit9CisKKyNyZWQgeworICBwb3NpdGlvbjogYWJzb2x1dGU7CisgIHotaW5kZXg6IC0xOwor ICBiYWNrZ3JvdW5kOiByZWQ7CisgIGNvbG9yOiB0cmFuc3BhcmVudDsKK30KKworLnRlc3Qgewor ICB3aWR0aDogMjAwcHg7CisgIGNvbG9yOiBncmVlbjsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3Jl ZW47Cit9Cisubm9ybWFsIHsKKyAgd2hpdGUtc3BhY2U6IG5vcm1hbDsKK30KKy5ub3dyYXAgewor ICB3aGl0ZS1zcGFjZTogbm93cmFwOworfQorPC9zdHlsZT4KKzwhLS0gd2hpdGUtc3BhY2U6IG5v cm1hbCBhbGxvd3Mgd3JhcHBpbmcgYXQgdGhlIG92ZXJmbG93aW5nIHdoaXRlc3BhY2UgY29udGVu dCAtLT4KKzxkaXYgaWQ9cmVkPlhYWFhYWFhYWFg8YnI+WDwvZGl2PgorPGRpdiBjbGFzcz0idGVz dCBub3dyYXAiPjxzcGFuIGNsYXNzPSJub3dyYXAiPlhYWFhYWFhYWFggPC9zcGFuPjxzcGFuIGNs YXNzPSJub3JtYWwiPiA8L3NwYW4+IFg8L3NwYW4+PC9kaXY+Cg== 442088 2021-10-21 16:50:02 -0700 2021-10-21 16:50:02 -0700 Patch with dependencies (webkit.org/b/232091) Patch.txt text/plain 14806 zalan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5YjA5NjFiMjVkMjkuLjg5NTVlNDFkMGJlYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDIxLTEwLTIxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBb TEZDXVtJRkNdIEFkZCBtaXNzaW5nIGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5IGNoZWNrIHdoZW4g YmV0d2VlbiB0d28gd2hpdGVzcGFjZSBpbmxpbmUgaXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjA1NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9pbmxpbmUvd2hpdGUtc3BhY2Utbm93 cmFwLWFuZC1ub3JtYWwtaW5saW5lLWJveC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAg KiBmYXN0L2lubGluZS93aGl0ZS1zcGFjZS1ub3dyYXAtYW5kLW5vcm1hbC1pbmxpbmUtYm94Lmh0 bWw6IEFkZGVkLgorCiAyMDIxLTEwLTIxICBBeXVtaSBLb2ppbWEgIDxheXVtaV9rb2ppbWFAYXBw bGUuY29tPgogCiAgICAgICAgIFJlZ3Jlc3Npb24ocjI4NDQzOSk6IFsgaVBhZCBdIGZhc3QvY2Fu dmFzL2NhbnZhcy1jcmVhdGVQYXR0ZXJuLXZpZGVvLWxvYWRpbmcuaHRtbCBhbmQgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2NhbnZhcy9lbGVtZW50L21hbnVhbC9pbWFnZWJp dG1hcC9jYW52YXMtY3JlYXRlSW1hZ2VCaXRtYXAtdmlkZW8tcmVzaXplLmh0bWwgYXJlIGZhaWxp bmcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS93aGl0ZS1zcGFjZS1ub3dy YXAtYW5kLW5vcm1hbC1pbmxpbmUtYm94LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L2lubGluZS93aGl0ZS1zcGFjZS1ub3dyYXAtYW5kLW5vcm1hbC1pbmxpbmUtYm94LWV4cGVjdGVk Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5hYzgxZjFjZDJj Y2EKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS93aGl0ZS1zcGFj ZS1ub3dyYXAtYW5kLW5vcm1hbC1pbmxpbmUtYm94LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwx MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8c3R5bGU+CitkaXYgeworICBmb250OiAyMHB4LzEgQWhl bTsKKyAgd2lkdGg6IDIwMHB4OworICBjb2xvcjogZ3JlZW47CisgIGJhY2tncm91bmQtY29sb3I6 IGdyZWVuOworfQorPC9zdHlsZT4KKzxkaXY+PGJyPjxicj48L2Rpdj4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvaW5saW5lL3doaXRlLXNwYWNlLW5vd3JhcC1hbmQtbm9ybWFsLWlubGlu ZS1ib3guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3doaXRlLXNwYWNlLW5vd3JhcC1h bmQtbm9ybWFsLWlubGluZS1ib3guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAuLjRkM2I0OTRiZDg3MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvaW5saW5lL3doaXRlLXNwYWNlLW5vd3JhcC1hbmQtbm9ybWFsLWlubGluZS1ib3guaHRtbApA QCAtMCwwICsxLDI4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KK2RpdiB7CisgIGZvbnQ6 IDIwcHgvMSBBaGVtOworfQorCisjcmVkIHsKKyAgcG9zaXRpb246IGFic29sdXRlOworICB6LWlu ZGV4OiAtMTsKKyAgYmFja2dyb3VuZDogcmVkOworICBjb2xvcjogdHJhbnNwYXJlbnQ7Cit9CisK Ky50ZXN0IHsKKyAgd2lkdGg6IDIwMHB4OworICBjb2xvcjogZ3JlZW47CisgIGJhY2tncm91bmQt Y29sb3I6IGdyZWVuOworfQorLm5vcm1hbCB7CisgIHdoaXRlLXNwYWNlOiBub3JtYWw7Cit9Cisu bm93cmFwIHsKKyAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKK30KKzwvc3R5bGU+Cis8IS0tIHdoaXRl LXNwYWNlOiBub3JtYWwgYWxsb3dzIHdyYXBwaW5nIGF0IHRoZSBvdmVyZmxvd2luZyB3aGl0ZXNw YWNlIGNvbnRlbnQgLS0+Cis8ZGl2IGlkPXJlZD5YWFhYWFhYWFhYPGJyPlg8L2Rpdj4KKzxkaXYg Y2xhc3M9InRlc3Qgbm93cmFwIj48c3BhbiBjbGFzcz0ibm93cmFwIj5YWFhYWFhYWFhYIDwvc3Bh bj48c3BhbiBjbGFzcz0ibm9ybWFsIj4gPC9zcGFuPiBYPC9zcGFuPjwvZGl2PgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IGUzNTdiNzE3NjAxMi4uZTI4NzJjZmExOWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDgg QEAKKzIwMjEtMTAtMjEgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAg IFtMRkNdW0lGQ10gQWRkIG1pc3NpbmcgaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkgY2hlY2sgd2hl biBiZXR3ZWVuIHR3byB3aGl0ZXNwYWNlIGlubGluZSBpdGVtcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDU1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRHVlIHRvIHRoZSBpc1dyYXBwaW5nQWxsb3dl ZCBjaGVja3MgaW4gaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoKSB0byBzcGVlZCB1cCBsaW5lIGJy ZWFraW5nLAorICAgICAgICB3ZSBtYXkgZW5kIHVwIHdpdGggYWRqYWNlbnQgd2hpdGVzcGFjZSBj b250ZW50IHdpdGggZGlmZmVyZW50IHdyYXBwaW5nIHN0eWxlcyAoZW1iZWRkZWQgaW4gc2VwYXJh dGUgaW5saW5lIGJveGVzKS4KKyAgICAgICAgZS5nLiA8c3BhbiBzdHlsZT0id2hpdGUtc3BhY2U6 IG5vLXdyYXAiPlhYWCA8L3NwYW4+PHNwYW4gc3R5bGU9IndoaXRlLXNwYWNlOiBub3JtYWwiPiBY PC9zcGFuCisKKyAgICAgICAgVGVzdDogZmFzdC9pbmxpbmUvd2hpdGUtc3BhY2Utbm93cmFwLWFu ZC1ub3JtYWwtaW5saW5lLWJveC5odG1sCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OmlzVmlzdWFsbHlFbXB0eVdoaXRlc3BhY2VDb250ZW50KToKKyAgICAgICAgKiBs YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KToKKworMjAy MS0xMC0yMSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11b SUZDXSBBZGQgc3VwcG9ydCBmb3IgY2hlY2tpbmcgbGVhZGluZyBjb2xsYXBzaWJsZSB3aGl0ZXNw YWNlIGluIElubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwOTEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNo IGVuc3VyZXMgdGhhdCB0aGUgbGVhZGluZyBjb2xsYXBzaWJsZSB3aGl0ZXNwYWNlIG9uIHRoZSBj b250aW51b3VzIHJ1biBpcyB0YWtlbgorICAgICAgICBpbnRvIGFjY291bnQgd2hlbiBjaGVja2lu ZyBpZiB0aGUgb3RoZXJ3aXNlIG92ZXJmbG93aW5nIGNvbnRlbnQgbWF5IGZpdCB0aGUgbGluZS4K KyAgICAgICAgZS5nLgorICAgICAgICA8c3BhbiBzdHlsZT0id2hpdGUtc3BhY2U6IG5vd3JhcCI+ bm9fd3JhcCA8L3NwYW4+PHNwYW4+IHllc193cmFwPC9zcGFuPgorICAgICAgICBUaGUgIiB5ZXNf d3JhcCIgY29udGVudCBoYXMgYSBjb2xsYXBzaWJsZSBsZWFkaW5nIHdoaXRlc3BhY2UgaGVyZS4g CisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250 ZW50QnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzVmlzdWFsbHlFbXB0 eVdoaXRlc3BhY2VDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29u dGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6 OmFwcGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2Vy OjpDb250aW51b3VzQ29udGVudDo6cmVzZXQpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmg6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6bGVhZGlu Z0NvbGxhcHNpYmxlV2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OnRyYWlsaW5nQ29sbGFwc2libGVX aWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVh a2VyOjpDb250aW51b3VzQ29udGVudDo6aGFzQ29sbGFwc2libGVDb250ZW50IGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXND b250ZW50Ojppc0Z1bGx5Q29sbGFwc2libGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OmNvbGxhcHNpYmxl TG9naWNhbFdpZHRoIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50Ojpub25Db2xsYXBzaWJsZUxv Z2ljYWxXaWR0aCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Oklu bGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6aGFzVHJhaWxpbmdDb2xsYXBz aWJsZUNvbnRlbnQgY29uc3QpOiBEZWxldGVkLgorCiAyMDIxLTEwLTIxICBUeWxlciBXaWxjb2Nr ICA8dHlsZXJfd0BhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IFJlbW92ZSByZWR1bmRhbnQgaW5z ZXJ0IG9mIGF1dG9maWxsIGJ1dHRvbiBjaGlsZCBpbiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0 OjphZGRUZXh0RmllbGRDaGlsZHJlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVu dEJyZWFrZXIuY3BwCmluZGV4IDc2M2NhZDBhMzVkMS4uMTFkNDdmZWY1Y2EzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVD b250ZW50QnJlYWtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCkBAIC05NywxNSArOTcsMTkg QEAgc3RhdGljIGlubGluZSBib29sIGlzVmlzdWFsbHlFbXB0eVdoaXRlc3BhY2VDb250ZW50KGNv bnN0IElubGluZUNvbnRlbnRCcmVha2VyOjoKIHsKICAgICAvLyBbPHNwYW4+PC9zcGFuPiBdIFs8 c3Bhbj4gPC9zcGFuPl0gWyA8c3BhbiBzdHlsZT0icGFkZGluZzogMHB4OyI+PC9zcGFuPl0gYXJl IGFsbCBjb25zaWRlcmVkIHZpc3VhbGx5IGVtcHR5IHdoaXRlc3BhY2UgY29udGVudC4KICAgICAv LyBbPHNwYW4gc3R5bGU9ImJvcmRlcjogMXB4IHNvbGlkIHJlZCI+PC9zcGFuPiBdIHdoaWxlIHRo aXMgaXMgd2hpdGVzcGFjZSBjb250ZW50IG9ubHksIGl0IGlzIG5vdCBjb25zaWRlcmVkIHZpc3Vh bGx5IGVtcHR5LgotICAgIC8vIER1ZSB0byBjb21taXQgYm91bmRhcnkgcnVsZXMsIHdlIGp1c3Qg bmVlZCB0byBjaGVjayB0aGUgZmlyc3Qgbm9uLXR5cGVsZXNzIGlubGluZSBpdGVtIChjYW4ndCBo YXZlIGJvdGggW2ltZ10gYW5kIFt0ZXh0XSkKKyAgICBBU1NFUlQoIWNvbnRpbnVvdXNDb250ZW50 LnJ1bnMoKS5pc0VtcHR5KCkpOworICAgIGF1dG8gaGFzV2hpdGVzcGFjZSA9IGZhbHNlOwogICAg IGZvciAoYXV0byYgcnVuIDogY29udGludW91c0NvbnRlbnQucnVucygpKSB7CiAgICAgICAgIGF1 dG8mIGlubGluZUl0ZW0gPSBydW4uaW5saW5lSXRlbTsKLSAgICAgICAgLy8gRklYTUU6IGNoZWNr IGZvciBwYWRkaW5nIGJvcmRlciBldGMuCisgICAgICAgIC8vIEZJWE1FOiBjaGVjayBpZiB2aXN1 YWwgZGVjb3JhdGlvbiBtYWtlcyBhIGRpZmZlcmVuY2UgaGVyZSBlLmcuIHBhZGRpbmcgYm9yZGVy LgogICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0lubGluZUJveFN0YXJ0KCkgfHwgaW5saW5lSXRl bS5pc0lubGluZUJveEVuZCgpKQogICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIHJldHVy biBpbmxpbmVJdGVtLmlzVGV4dCgpICYmIGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJ dGVtKS5pc1doaXRlc3BhY2UoKTsKKyAgICAgICAgYXV0byBpc1doaXRlc3BhY2UgPSBpbmxpbmVJ dGVtLmlzVGV4dCgpICYmIGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKS5pc1do aXRlc3BhY2UoKTsKKyAgICAgICAgaWYgKCFpc1doaXRlc3BhY2UpCisgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgICAgIGhhc1doaXRlc3BhY2UgPSB0cnVlOwogICAgIH0KLSAgICByZXR1 cm4gZmFsc2U7CisgICAgcmV0dXJuIGhhc1doaXRlc3BhY2U7CiB9CiAKIHN0YXRpYyBpbmxpbmUg Ym9vbCBpc05vbkNvbnRlbnRSdW5zT25seShjb25zdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29u dGludW91c0NvbnRlbnQmIGNvbnRpbnVvdXNDb250ZW50KQpAQCAtMTczLDE2ICsxNzcsMTcgQEAg SW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vz c092ZXJmbG93aW5nQ29udGVudChjb24KICAgICBBU1NFUlQoIWNvbnRpbnVvdXNDb250ZW50LnJ1 bnMoKS5pc0VtcHR5KCkpOwogCiAgICAgQVNTRVJUKGNvbnRpbnVvdXNDb250ZW50LmxvZ2ljYWxX aWR0aCgpID4gbGluZVN0YXR1cy5hdmFpbGFibGVXaWR0aCk7Ci0gICAgaWYgKGNvbnRpbnVvdXND b250ZW50Lmhhc1RyYWlsaW5nQ29sbGFwc2libGVDb250ZW50KCkpIHsKLSAgICAgICAgQVNTRVJU KGhhc1RyYWlsaW5nVGV4dENvbnRlbnQob3ZlcmZsb3dDb250ZW50KSk7Ci0gICAgICAgIC8vIEZp cnN0IGNoZWNrIGlmIHRoZSBjb250ZW50IGZpdHMgd2l0aG91dCB0aGUgdHJhaWxpbmcgY29sbGFw c2libGUgcGFydC4KLSAgICAgICAgaWYgKGNvbnRpbnVvdXNDb250ZW50Lm5vbkNvbGxhcHNpYmxl TG9naWNhbFdpZHRoKCkgPD0gbGluZVN0YXR1cy5hdmFpbGFibGVXaWR0aCkKLSAgICAgICAgICAg IHJldHVybiB7IFJlc3VsdDo6QWN0aW9uOjpLZWVwLCBJc0VuZE9mTGluZTo6Tm8gfTsKLSAgICAg ICAgLy8gTm93IGNoZWNrIGlmIHdlIGNhbiB0cmltIHRoZSBsaW5lIHRvby4KLSAgICAgICAgaWYg KGxpbmVTdGF0dXMuaGFzRnVsbHlDb2xsYXBzaWJsZVRyYWlsaW5nUnVuICYmIGNvbnRpbnVvdXND b250ZW50LmlzRnVsbHlDb2xsYXBzaWJsZSgpKSB7CisgICAgaWYgKGNvbnRpbnVvdXNDb250ZW50 Lmhhc0NvbGxhcHNpYmxlQ29udGVudCgpKSB7CisgICAgICAgIGlmIChsaW5lU3RhdHVzLmhhc0Z1 bGx5Q29sbGFwc2libGVUcmFpbGluZ0NvbnRlbnQgJiYgY29udGludW91c0NvbnRlbnQuaXNGdWxs eUNvbGxhcHNpYmxlKCkpIHsKICAgICAgICAgICAgIC8vIElmIHRoaXMgbmV3IGNvbnRlbnQgaXMg ZnVsbHkgY29sbGFwc2libGUsIGl0IHNob3VsZCBzdXJlbHkgZml0LgogICAgICAgICAgICAgcmV0 dXJuIHsgUmVzdWx0OjpBY3Rpb246OktlZXAsIElzRW5kT2ZMaW5lOjpObyB9OwogICAgICAgICB9 CisgICAgICAgIC8vIENoZWNrIGlmIHRoZSBjb250ZW50IGZpdHMgaWYgd2UgY29sbGFwc2VkIGl0 LgorICAgICAgICBhdXRvIHNwYWNlUmVxdWlyZWQgPSBjb250aW51b3VzQ29udGVudC5sb2dpY2Fs V2lkdGgoKSAtIGNvbnRpbnVvdXNDb250ZW50LnRyYWlsaW5nQ29sbGFwc2libGVXaWR0aCgpOwor ICAgICAgICBpZiAobGluZVN0YXR1cy5oYXNGdWxseUNvbGxhcHNpYmxlVHJhaWxpbmdDb250ZW50 KQorICAgICAgICAgICAgc3BhY2VSZXF1aXJlZCAtPSBjb250aW51b3VzQ29udGVudC5sZWFkaW5n Q29sbGFwc2libGVXaWR0aCgpOworICAgICAgICBpZiAoc3BhY2VSZXF1aXJlZCA8PSBsaW5lU3Rh dHVzLmF2YWlsYWJsZVdpZHRoKQorICAgICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246 OktlZXAsIElzRW5kT2ZMaW5lOjpObyB9OwogICAgIH0gZWxzZSBpZiAobGluZVN0YXR1cy5jb2xs YXBzaWJsZVdpZHRoICYmIGlzTm9uQ29udGVudFJ1bnNPbmx5KGNvbnRpbnVvdXNDb250ZW50KSkg ewogICAgICAgICAvLyBMZXQncyBzZWUgaWYgdGhlIG5vbi1jb250ZW50IHJ1bnMgZml0IHdoZW4g dGhlIGxpbmUgaGFzIHRyYWlsaW5nIGNvbGxhcHNpYmxlIGNvbnRlbnQuCiAgICAgICAgIC8vICJ0 ZXh0IGNvbnRlbnQgPHNwYW4gc3R5bGU9InBhZGRpbmc6IDFweCI+PC9zcGFuPiIgPC0gdGhlIDxz cGFuPjwvc3Bhbj4gcnVucyBjb3VsZCBmaXQgYWZ0ZXIgY29sbGFwc2luZyB0aGUgdHJhaWxpbmcg d2hpdGVzcGFjZS4KQEAgLTY0OSwyOSArNjU0LDMwIEBAIE9wdGlvblNldDxJbmxpbmVDb250ZW50 QnJlYWtlcjo6V29yZEJyZWFrUnVsZT4gSW5saW5lQ29udGVudEJyZWFrZXI6OndvcmRCcmVha0Jl CiB2b2lkIElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6YXBwZW5kKGNv bnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5p dD4gY29sbGFwc2libGVXaWR0aCkKIHsKICAgICBBU1NFUlQoaW5saW5lSXRlbS5pc1RleHQoKSB8 fCBpbmxpbmVJdGVtLmlzQm94KCkgfHwgaW5saW5lSXRlbS5pc0lubGluZUJveFN0YXJ0KCkgfHwg aW5saW5lSXRlbS5pc0lubGluZUJveEVuZCgpKTsKKyAgICBhdXRvIGlzTGVhZGluZ0NvbGxhcHNp YmxlID0gY29sbGFwc2libGVXaWR0aCAmJiAobV9ydW5zLmlzRW1wdHkoKSB8fCBpc0Z1bGx5Q29s bGFwc2libGUoKSk7CiAgICAgbV9ydW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIHN0eWxlLCBsb2dp Y2FsV2lkdGggfSk7CiAgICAgbV9sb2dpY2FsV2lkdGggPSBjbGFtcFRvPElubGluZUxheW91dFVu aXQ+KG1fbG9naWNhbFdpZHRoICsgbG9naWNhbFdpZHRoKTsKICAgICBpZiAoIWNvbGxhcHNpYmxl V2lkdGgpIHsKICAgICAgICAgaWYgKGlubGluZUl0ZW0uaXNUZXh0KCkgfHwgaW5saW5lSXRlbS5p c0JveCgpKSB7CiAgICAgICAgICAgICAvLyBJbmxpbmUgYm94ZXMgZG8gbm90IHByZXZlbnQgdGhl IHRyYWlsaW5nIGNvbnRlbnQgZnJvbSBnZXR0aW5nIGNvbGxhcHNlZC4KLSAgICAgICAgICAgIG1f Y29sbGFwc2libGVMb2dpY2FsV2lkdGggPSB7IH07CisgICAgICAgICAgICBtX3RyYWlsaW5nQ29s bGFwc2libGVXaWR0aCA9IHsgfTsKICAgICAgICAgfQogICAgICAgICByZXR1cm47CiAgICAgfQog ICAgIEFTU0VSVCgqY29sbGFwc2libGVXaWR0aCA8PSBsb2dpY2FsV2lkdGgpOwotICAgIGlmICgq Y29sbGFwc2libGVXaWR0aCA9PSBsb2dpY2FsV2lkdGgpIHsKLSAgICAgICAgLy8gRnVsbHkgY29s bGFwc2libGUgcnVuLgotICAgICAgICBtX2NvbGxhcHNpYmxlTG9naWNhbFdpZHRoICs9IGxvZ2lj YWxXaWR0aDsKKyAgICBpZiAoaXNMZWFkaW5nQ29sbGFwc2libGUpIHsKKyAgICAgICAgQVNTRVJU KCFtX3RyYWlsaW5nQ29sbGFwc2libGVXaWR0aCk7CisgICAgICAgIG1fbGVhZGluZ0NvbGxhcHNp YmxlV2lkdGggKz0gKmNvbGxhcHNpYmxlV2lkdGg7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0g ICAgLy8gUGFydGlhbGx5IGNvbGxhcHNpYmxlIHJ1bi4KLSAgICBtX2NvbGxhcHNpYmxlTG9naWNh bFdpZHRoID0gKmNvbGxhcHNpYmxlV2lkdGg7CisgICAgbV90cmFpbGluZ0NvbGxhcHNpYmxlV2lk dGggPSAqY29sbGFwc2libGVXaWR0aCA9PSBsb2dpY2FsV2lkdGggPyBtX3RyYWlsaW5nQ29sbGFw c2libGVXaWR0aCArIGxvZ2ljYWxXaWR0aCA6ICpjb2xsYXBzaWJsZVdpZHRoOwogfQogCiB2b2lk IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6cmVzZXQoKQogewogICAg IG1fbG9naWNhbFdpZHRoID0geyB9OwotICAgIG1fY29sbGFwc2libGVMb2dpY2FsV2lkdGggPSB7 IH07CisgICAgbV9sZWFkaW5nQ29sbGFwc2libGVXaWR0aCA9IHsgfTsKKyAgICBtX3RyYWlsaW5n Q29sbGFwc2libGVXaWR0aCA9IHsgfTsKICAgICBtX3J1bnMuY2xlYXIoKTsKIH0KIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUNvbnRlbnRCcmVha2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5oCmluZGV4IDU3M2JhNGQ5MDBhMy4u MDlhYWU4YWZlMmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2Vy LmgKQEAgLTc3LDEyICs3NywxMiBAQCBwdWJsaWM6CiAgICAgLy8gc2VlIGh0dHBzOi8vZHJhZnRz LmNzc3dnLm9yZy9jc3MtdGV4dC0zLyNsaW5lLWJyZWFrLWRldGFpbHMKICAgICBzdHJ1Y3QgQ29u dGludW91c0NvbnRlbnQgewogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgp IGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFdpZHRoOyB9Ci0gICAgICAgIElubGluZUxheW91dFVu aXQgY29sbGFwc2libGVMb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2NvbGxhcHNpYmxl TG9naWNhbFdpZHRoOyB9Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgbm9uQ29sbGFwc2libGVM b2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsV2lkdGgoKSAtIGNvbGxhcHNpYmxl TG9naWNhbFdpZHRoKCk7IH0KLSAgICAgICAgYm9vbCBoYXNUcmFpbGluZ0NvbGxhcHNpYmxlQ29u dGVudCgpIGNvbnN0IHsgcmV0dXJuICEhY29sbGFwc2libGVMb2dpY2FsV2lkdGgoKTsgfQotICAg ICAgICBib29sIGlzRnVsbHlDb2xsYXBzaWJsZSgpIGNvbnN0IHsgcmV0dXJuIGxvZ2ljYWxXaWR0 aCgpID09IGNvbGxhcHNpYmxlTG9naWNhbFdpZHRoKCk7IH0KKyAgICAgICAgSW5saW5lTGF5b3V0 VW5pdCBsZWFkaW5nQ29sbGFwc2libGVXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbGVhZGluZ0Nv bGxhcHNpYmxlV2lkdGg7IH0KKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCB0cmFpbGluZ0NvbGxh cHNpYmxlV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX3RyYWlsaW5nQ29sbGFwc2libGVXaWR0aDsg fQorICAgICAgICBib29sIGhhc0NvbGxhcHNpYmxlQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIHRy YWlsaW5nQ29sbGFwc2libGVXaWR0aCgpID4gMCB8fCBsZWFkaW5nQ29sbGFwc2libGVXaWR0aCgp ID4gMDsgfQorICAgICAgICBib29sIGlzRnVsbHlDb2xsYXBzaWJsZSgpIGNvbnN0IHsgcmV0dXJu IGxvZ2ljYWxXaWR0aCgpID09IHRyYWlsaW5nQ29sbGFwc2libGVXaWR0aCgpICsgbGVhZGluZ0Nv bGxhcHNpYmxlV2lkdGgoKTsgfQogCi0gICAgICAgIHZvaWQgYXBwZW5kKGNvbnN0IElubGluZUl0 ZW0mLCBjb25zdCBSZW5kZXJTdHlsZSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoLCBz dGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGNvbGxhcHNpYmxlV2lkdGgpOworICAgICAg ICB2b2lkIGFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxp bmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0 PiBjb2xsYXBzaWJsZVdpZHRoID0gc3RkOjpudWxsb3B0KTsKICAgICAgICAgdm9pZCByZXNldCgp OwogCiAgICAgICAgIHN0cnVjdCBSdW4gewpAQCAtMTAwLDcgKzEwMCw4IEBAIHB1YmxpYzoKICAg ICBwcml2YXRlOgogICAgICAgICBSdW5MaXN0IG1fcnVuczsKICAgICAgICAgSW5saW5lTGF5b3V0 VW5pdCBtX2xvZ2ljYWxXaWR0aCB7IDAgfTsKLSAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2Nv bGxhcHNpYmxlTG9naWNhbFdpZHRoIHsgMCB9OworICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1f bGVhZGluZ0NvbGxhcHNpYmxlV2lkdGggeyAwIH07CisgICAgICAgIElubGluZUxheW91dFVuaXQg bV90cmFpbGluZ0NvbGxhcHNpYmxlV2lkdGggeyAwIH07CiAgICAgfTsKIAogICAgIHN0cnVjdCBM aW5lU3RhdHVzIHsKQEAgLTEwOCw3ICsxMDksNyBAQCBwdWJsaWM6CiAgICAgICAgIElubGluZUxh eW91dFVuaXQgYXZhaWxhYmxlV2lkdGggeyAwIH07CiAgICAgICAgIElubGluZUxheW91dFVuaXQg Y29sbGFwc2libGVXaWR0aCB7IDAgfTsKICAgICAgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlv dXRVbml0PiB0cmFpbGluZ1NvZnRIeXBoZW5XaWR0aDsKLSAgICAgICAgYm9vbCBoYXNGdWxseUNv bGxhcHNpYmxlVHJhaWxpbmdSdW4geyBmYWxzZSB9OworICAgICAgICBib29sIGhhc0Z1bGx5Q29s bGFwc2libGVUcmFpbGluZ0NvbnRlbnQgeyBmYWxzZSB9OwogICAgICAgICBib29sIGhhc0NvbnRl bnQgeyBmYWxzZSB9OwogICAgICAgICBib29sIGhhc1dyYXBPcHBvcnR1bml0eUF0UHJldmlvdXNQ b3NpdGlvbiB7IGZhbHNlIH07CiAgICAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVC dWlsZGVyLmNwcAppbmRleCA3MTBhODFmYmNhMTcuLmViOWVhMGJiNGFhZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtOTIsMTIgKzkyLDE2IEBAIHN0YXRp YyBpbmxpbmUgYm9vbCBpc0F0U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dCYgaW5saW5lCiAgICAgaWYgKGN1cnJlbnQuaXNUZXh0KCkgJiYgbmV4dC5pc1Rl eHQoKSkgewogICAgICAgICBhdXRvJiBjdXJyZW50SW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJ bmxpbmVUZXh0SXRlbT4oY3VycmVudCk7CiAgICAgICAgIGF1dG8mIG5leHRJbmxpbmVUZXh0SXRl bSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihuZXh0KTsKKyAgICAgICAgaWYgKGN1cnJlbnRJ bmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiBuZXh0SW5saW5lVGV4dEl0ZW0uaXNXaGl0 ZXNwYWNlKCkpIHsKKyAgICAgICAgICAgIC8vIDxzcGFuPiA8L3NwYW4+PHNwYW4+IDwvc3Bhbj4u IERlcGVuZGluZyBvbiB0aGUgc3R5bGVzLCB0aGVyZSBtYXkgb3IgbWF5IG5vdCBiZSBhIHNvZnQg d3JhcCBvcHBvcnR1bml0eSBiZXR3ZWVuIHRoZXNlIDIgd2hpdGVzcGFjZSBjb250ZW50LgorICAg ICAgICAgICAgcmV0dXJuIFRleHRVdGlsOjppc1dyYXBwaW5nQWxsb3dlZChjdXJyZW50SW5saW5l VGV4dEl0ZW0uc3R5bGUoKSkgfHwgVGV4dFV0aWw6OmlzV3JhcHBpbmdBbGxvd2VkKG5leHRJbmxp bmVUZXh0SXRlbS5zdHlsZSgpKTsKKyAgICAgICAgfQogICAgICAgICBpZiAoY3VycmVudElubGlu ZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKSB7Ci0gICAgICAgICAgICAvLyBbIF1bdGV4dF0gOiBh ZnRlciBbd2hpdGVzcGFjZV0gcG9zaXRpb24gaXMgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkuCisg ICAgICAgICAgICAvLyAiIDxzcGFuPnRleHQ8L3NwYW4+IiA6IGFmdGVyIFt3aGl0ZXNwYWNlXSBw b3NpdGlvbiBpcyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eS4KICAgICAgICAgICAgIHJldHVybiBU ZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQoY3VycmVudElubGluZVRleHRJdGVtLnN0eWxlKCkp OwogICAgICAgICB9CiAgICAgICAgIGlmIChuZXh0SW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNl KCkpIHsKLSAgICAgICAgICAgIC8vIFt0ZXh0XVsgXSAoPHNwYW4+dGV4dDwvc3Bhbj4gKQorICAg ICAgICAgICAgLy8gIjxzcGFuPnRleHQ8L3NwYW4+ICIKICAgICAgICAgICAgIC8vIHdoaXRlLXNw YWNlOiBicmVhay1zcGFjZXM6IGxpbmUgYnJlYWtpbmcgb3Bwb3J0dW5pdHkgZXhpc3RzIGFmdGVy IGV2ZXJ5IHByZXNlcnZlZCB3aGl0ZSBzcGFjZSBjaGFyYWN0ZXIsIGJ1dCBub3QgYmVmb3JlLgog ICAgICAgICAgICAgcmV0dXJuIFRleHRVdGlsOjppc1dyYXBwaW5nQWxsb3dlZChuZXh0SW5saW5l VGV4dEl0ZW0uc3R5bGUoKSkgJiYgbmV4dElubGluZVRleHRJdGVtLnN0eWxlKCkud2hpdGVTcGFj ZSgpICE9IFdoaXRlU3BhY2U6OkJyZWFrU3BhY2VzOwogICAgICAgICB9Cg==