232056 2021-10-20 16:34:04 -0700 [LFC][IFC] Check the parent style for content wrapping when collecting wrap opportunities 2021-10-22 08:18:15 -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 1806916 0 zalan 2021-10-20 16:34:04 -0700 ssia 1806992 1 441977 zalan 2021-10-20 20:13:42 -0700 Created attachment 441977 Patch 1807505 2 442104 zalan 2021-10-21 20:21:54 -0700 Created attachment 442104 Patch 1807506 3 442105 zalan 2021-10-21 20:23:03 -0700 Created attachment 442105 Patch with dependencies 1807677 4 ews-feeder 2021-10-22 08:17:18 -0700 Committed r284683 (243403@main): <https://commits.webkit.org/243403@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442104. 1807678 5 webkit-bug-importer 2021-10-22 08:18:15 -0700 <rdar://problem/84549955> 441977 2021-10-20 20:13:42 -0700 2021-10-21 20:21:52 -0700 Patch bug-232056-20211020201341.patch text/plain 4511 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM2MjEzMDBlMGZmZGUz ZTE0MzM5N2U1YTkwZjdmZTFjZWRmZjIzZi4uMjNjMmMwNWY3YmU5YWIxOTY5ODk3MmQwNmY0ODYx MjEwYjMxYzg4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTIwICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIENoZWNrIHRo ZSBwYXJlbnQgc3R5bGUgZm9yIGNvbnRlbnQgd3JhcHBpbmcgd2hlbiBjb2xsZWN0aW5nIHdyYXAg b3Bwb3J0dW5pdGllcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjMyMDU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU2VlIHRoZSBjb21tZW50IGluIExpbmVCdWlsZGVyOjpoYW5kbGVJbmxpbmVDb250ZW50 LgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFu ZGxlSW5saW5lQ29udGVudCk6CisKIDIwMjEtMTAtMjAgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQWRkIG1pc3NpbmcgaXNBdFNvZnRXcmFwT3Bw b3J0dW5pdHkgY2hlY2sgd2hlbiBiZXR3ZWVuIHR3byB3aGl0ZXNwYWNlIGlubGluZSBpdGVtcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IGViOWVhMGJiNGFh ZDQ0YzIzMjBhMWE3MWRjMDRjMzI4YzI1YzBmZmIuLjgyYmE3NzdmYjYxNzg3OTJlN2QzZWI1ZDVk MjQ4Y2Q2MjY4NjZiM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5j cHAKQEAgLTc3MiwxMSArNzcyLDEyIEBAIExpbmVCdWlsZGVyOjpSZXN1bHQgTGluZUJ1aWxkZXI6 OmhhbmRsZUlubGluZUNvbnRlbnQoSW5saW5lQ29udGVudEJyZWFrZXImIGlubGluCiAgICAgICAg ICAgICBtX2xpbmUuYXBwZW5kKHJ1bi5pbmxpbmVJdGVtLCBydW4uc3R5bGUsIHJ1bi5sb2dpY2Fs V2lkdGgpOwogICAgICAgICBpZiAobGluZUNhbmRpZGF0ZS5pbmxpbmVDb250ZW50Lmhhc1RyYWls aW5nU29mdFdyYXBPcHBvcnR1bml0eSgpKSB7CiAgICAgICAgICAgICAvLyBDaGVjayBpZiB3ZSBh cmUgYWxsb3dlZCB0byB3cmFwIGF0IHRoaXMgcG9zaXRpb24uCi0gICAgICAgICAgICBhdXRvJiB0 cmFpbGluZ1J1biA9IGNhbmRpZGF0ZVJ1bnMubGFzdCgpOwotICAgICAgICAgICAgLy8gRklYTUU6 IFRoZXJlIG11c3QgYmUgYSB3YXkgdG8gZGVjaWRlIGlmIHRoZSB0cmFpbGluZyBydW4gYWN0dWFs bHkgZW5kZWQgdXAgb24gdGhlIGxpbmUuCi0gICAgICAgICAgICAvLyBMZXQncyBqdXN0IGRlYWwg d2l0aCBjb2xsYXBzZWQgbGVhZGluZyB3aGl0ZXNwYWNlIGZvciBub3cuCi0gICAgICAgICAgICBp ZiAobV9saW5lLmhhc0NvbnRlbnQoKSAmJiBUZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQodHJh aWxpbmdSdW4uc3R5bGUpKQotICAgICAgICAgICAgICAgIG1fd3JhcE9wcG9ydHVuaXR5TGlzdC5h cHBlbmQoJnRyYWlsaW5nUnVuLmlubGluZUl0ZW0pOworICAgICAgICAgICAgYXV0byYgdHJhaWxp bmdJbmxpbmVJdGVtID0gY2FuZGlkYXRlUnVucy5sYXN0KCkuaW5saW5lSXRlbTsKKyAgICAgICAg ICAgIC8vIExldCdzIGp1c3QgaWdub3JlIGNhc2VzIGxpa2UgY29sbGFwc2VkIGxlYWRpbmcgd2hp dGVzcGFjZSBmb3Igbm93LgorICAgICAgICAgICAgLy8gTm90ZSB0aGF0IHdyYXBwaW5nIGhlcmUg aXMgZHJpdmVuIGJ5IHRoZSBzdHlsZSBvZiB0aGUgcGFyZW50IGFuZCBub3QgdGhlIGlubGluZSBp dGVtIGl0c2VsZi4KKyAgICAgICAgICAgIC8vIElubGluZSBpdGVtcyBzZXQgdGhlIHdyYXBwaW5n IHJ1bGVzIGZvciB0aGVpciBjb250ZW50IGFuZCBub3QgZm9yIHRoZW1zZWx2ZXMuCisgICAgICAg ICAgICBpZiAobV9saW5lLmhhc0NvbnRlbnQoKSAmJiBUZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93 ZWQodHJhaWxpbmdJbmxpbmVJdGVtLmxheW91dEJveCgpLnBhcmVudCgpLnN0eWxlKCkpKQorICAg ICAgICAgICAgICAgIG1fd3JhcE9wcG9ydHVuaXR5TGlzdC5hcHBlbmQoJnRyYWlsaW5nSW5saW5l SXRlbSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHsgcmVzdWx0LmlzRW5kT2ZMaW5lLCB7 IGNhbmRpZGF0ZVJ1bnMuc2l6ZSgpLCBmYWxzZSB9IH07CiAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDJlYjI1MjIx ZGZjZDIxYjc1NGY1NTkwYzNjOGYzZmYyZmViMWNlNjcuLmQ5OWQ5NTYxMjA1ODc4ZWJhMzkwZWI5 MjA2Y2I4ZTY5ZjljYmIzNDAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMC0yMCAgQWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDaGVjayB0 aGUgcGFyZW50IHN0eWxlIGZvciBjb250ZW50IHdyYXBwaW5nIHdoZW4gY29sbGVjdGluZyB3cmFw IG9wcG9ydHVuaXRpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzMjA1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0xMC0yMCAgQWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBBZGQgbWlzc2luZyBpc0F0U29m dFdyYXBPcHBvcnR1bml0eSBjaGVjayB3aGVuIGJldHdlZW4gdHdvIHdoaXRlc3BhY2UgaW5saW5l IGl0ZW1zCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0 VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA1NzgwYmY1ZGY5MjExZWIyNjExZTFiYmU1ZGEw MDMyNTZjYmFhMGJiLi5kNWMwYmFhZjMwNDdiNzJhNjhjNzIxNzk2OWZkOTY5NmMwMDc1MWUzIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3Rz L1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTI1NzcsNyArMjU3Nyw2IEBAIHdlYmtpdC5vcmcvYi8yMTQy OTAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvbGluZS1icmVh ay9saW5lCiB3ZWJraXQub3JnL2IvMjE0MjkwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy10ZXh0L2xpbmUtYnJlYWtpbmcvbGluZS1icmVha2luZy0wMTQuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MCBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC9saW5lLWJyZWFraW5nL2xpbmUtYnJlYWtpbmctMDE2 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQyOTAgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvbGluZS1icmVha2luZy9saW5lLWJy ZWFraW5nLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMTgzMjU4 IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L2xpbmUtYnJlYWtp bmcvbGluZS1icmVha2luZy1pYy0wMDMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzE5NTM0NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4 dC9vdmVyZmxvdy13cmFwL292ZXJmbG93LXdyYXAtYW55d2hlcmUtMDAzLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xOTUzNDUgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXRleHQvb3ZlcmZsb3ctd3JhcC9vdmVyZmxvdy13cmFwLW1pbi1jb250 ZW50LXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQy OTAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvb3ZlcmZsb3ct d3JhcC9vdmVyZmxvdy13cmFwLW5vcm1hbC1rZWVwLWFsbC0wMDEuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQo= 442104 2021-10-21 20:21:54 -0700 2021-10-22 08:17:19 -0700 Patch bug-232056-20211021202153.patch text/plain 5176 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGVlMGNmZGZiOGQyYjkz ZThlYmQ3MGMxMTQzYTRmZGE3MGY2MTJlZS4uNjgxMWNhNjcyOTkyMzkwMTQ5MTI5ZWRjNTZhZDQz YWVlNTViNmVkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTIxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIENoZWNrIHRo ZSBwYXJlbnQgc3R5bGUgZm9yIGNvbnRlbnQgd3JhcHBpbmcgd2hlbiBjb2xsZWN0aW5nIHdyYXAg b3Bwb3J0dW5pdGllcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjMyMDU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU2VlIHRoZSBjb21tZW50IGluIExpbmVCdWlsZGVyOjpoYW5kbGVJbmxpbmVDb250ZW50 LgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFu ZGxlSW5saW5lQ29udGVudCk6CisKIDIwMjEtMTAtMjEgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQWRkIG1pc3NpbmcgaXNBdFNvZnRXcmFwT3Bw b3J0dW5pdHkgY2hlY2sgd2hlbiBiZXR3ZWVuIHR3byB3aGl0ZXNwYWNlIGlubGluZSBpdGVtcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IGViOWVhMGJiNGFh ZDQ0YzIzMjBhMWE3MWRjMDRjMzI4YzI1YzBmZmIuLmVlYWQ0MWQ0M2JmM2FkM2RjZDFlNmI3MTdk ZDZhZGJkZTBhOGE3NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5j cHAKQEAgLTc3MCwxMyArNzcwLDIwIEBAIExpbmVCdWlsZGVyOjpSZXN1bHQgTGluZUJ1aWxkZXI6 OmhhbmRsZUlubGluZUNvbnRlbnQoSW5saW5lQ29udGVudEJyZWFrZXImIGlubGluCiAgICAgICAg IG1fbGluZUxvZ2ljYWxSZWN0ID0gbGluZUxvZ2ljYWxSZWN0Rm9yQ2FuZGlkYXRlQ29udGVudDsK ICAgICAgICAgZm9yIChhdXRvJiBydW4gOiBjYW5kaWRhdGVSdW5zKQogICAgICAgICAgICAgbV9s aW5lLmFwcGVuZChydW4uaW5saW5lSXRlbSwgcnVuLnN0eWxlLCBydW4ubG9naWNhbFdpZHRoKTsK LSAgICAgICAgaWYgKGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5oYXNUcmFpbGluZ1NvZnRX cmFwT3Bwb3J0dW5pdHkoKSkgewotICAgICAgICAgICAgLy8gQ2hlY2sgaWYgd2UgYXJlIGFsbG93 ZWQgdG8gd3JhcCBhdCB0aGlzIHBvc2l0aW9uLgorICAgICAgICAvLyBXZSBhcmUga2VlcGluZyB0 aGlzIGNvbnRlbnQgb24gdGhlIGxpbmUgYnV0IHdlIG5lZWQgdG8gY2hlY2sgaWYgd2UgY291bGQg aGF2ZSB3cmFwcGVkIGhlcmUKKyAgICAgICAgLy8gaW4gb3JkZXIgdG8gYmUgYWJsZSB0byByZXZl cnQgYmFjayB0byB0aGlzIHBvc2l0b24gaWYgbmVlZGVkLgorICAgICAgICAvLyBMZXQncyBqdXN0 IGlnbm9yZSBjYXNlcyBsaWtlIGNvbGxhcHNlZCBsZWFkaW5nIHdoaXRlc3BhY2UgZm9yIG5vdy4K KyAgICAgICAgaWYgKGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5oYXNUcmFpbGluZ1NvZnRX cmFwT3Bwb3J0dW5pdHkoKSAmJiBtX2xpbmUuaGFzQ29udGVudCgpKSB7CiAgICAgICAgICAgICBh dXRvJiB0cmFpbGluZ1J1biA9IGNhbmRpZGF0ZVJ1bnMubGFzdCgpOwotICAgICAgICAgICAgLy8g RklYTUU6IFRoZXJlIG11c3QgYmUgYSB3YXkgdG8gZGVjaWRlIGlmIHRoZSB0cmFpbGluZyBydW4g YWN0dWFsbHkgZW5kZWQgdXAgb24gdGhlIGxpbmUuCi0gICAgICAgICAgICAvLyBMZXQncyBqdXN0 IGRlYWwgd2l0aCBjb2xsYXBzZWQgbGVhZGluZyB3aGl0ZXNwYWNlIGZvciBub3cuCi0gICAgICAg ICAgICBpZiAobV9saW5lLmhhc0NvbnRlbnQoKSAmJiBUZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93 ZWQodHJhaWxpbmdSdW4uc3R5bGUpKQotICAgICAgICAgICAgICAgIG1fd3JhcE9wcG9ydHVuaXR5 TGlzdC5hcHBlbmQoJnRyYWlsaW5nUnVuLmlubGluZUl0ZW0pOworICAgICAgICAgICAgYXV0byYg dHJhaWxpbmdJbmxpbmVJdGVtID0gdHJhaWxpbmdSdW4uaW5saW5lSXRlbTsKKyAgICAgICAgICAg IC8vIE5vdGUgdGhhdCB3cmFwcGluZyBoZXJlIGNvdWxkIGJlIGRyaXZlbiBib3RoIGJ5IHRoZSBz dHlsZSBvZiB0aGUgcGFyZW50IGFuZCB0aGUgaW5saW5lIGl0ZW0gaXRzZWxmLgorICAgICAgICAg ICAgLy8gZS5nIGlubGluZSBib3hlcyBzZXQgdGhlIHdyYXBwaW5nIHJ1bGVzIGZvciB0aGVpciBj b250ZW50IGFuZCBub3QgZm9yIHRoZW1zZWx2ZXMuCisgICAgICAgICAgICBhdXRvJiBwYXJlbnRT dHlsZSA9IHRyYWlsaW5nSW5saW5lSXRlbS5sYXlvdXRCb3goKS5wYXJlbnQoKS5zdHlsZSgpOwor ICAgICAgICAgICAgYXV0byBpc1dyYXBPcHBvcnR1bml0eSA9IFRleHRVdGlsOjppc1dyYXBwaW5n QWxsb3dlZChwYXJlbnRTdHlsZSk7CisgICAgICAgICAgICBpZiAoIWlzV3JhcE9wcG9ydHVuaXR5 ICYmICh0cmFpbGluZ0lubGluZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpIHx8IHRyYWlsaW5nSW5s aW5lSXRlbS5pc0lubGluZUJveEVuZCgpKSkKKyAgICAgICAgICAgICAgICBpc1dyYXBPcHBvcnR1 bml0eSA9IFRleHRVdGlsOjppc1dyYXBwaW5nQWxsb3dlZCh0cmFpbGluZ1J1bi5zdHlsZSk7Cisg ICAgICAgICAgICBpZiAoaXNXcmFwT3Bwb3J0dW5pdHkpCisgICAgICAgICAgICAgICAgbV93cmFw T3Bwb3J0dW5pdHlMaXN0LmFwcGVuZCgmdHJhaWxpbmdJbmxpbmVJdGVtKTsKICAgICAgICAgfQog ICAgICAgICByZXR1cm4geyByZXN1bHQuaXNFbmRPZkxpbmUsIHsgY2FuZGlkYXRlUnVucy5zaXpl KCksIGZhbHNlIH0gfTsKICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNGNjMjM1N2M1NWQxOTFiODA4ZGMxNzY4Njkw NzIyYWIyZWMyYTdkMS4uYjI0N2I1Mjg2MDViOTFjY2E2MmJjZDIyN2JjNDE2MDdmMjdiY2I3OSAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTEwLTIxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIENoZWNrIHRoZSBwYXJlbnQgc3R5bGUgZm9y IGNvbnRlbnQgd3JhcHBpbmcgd2hlbiBjb2xsZWN0aW5nIHdyYXAgb3Bwb3J0dW5pdGllcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDU2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0 YXRpb25zOgorCiAyMDIxLTEwLTIxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTEZDXVtJRkNdIEFkZCBtaXNzaW5nIGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5IGNo ZWNrIHdoZW4gYmV0d2VlbiB0d28gd2hpdGVzcGFjZSBpbmxpbmUgaXRlbXMKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp b25zCmluZGV4IDU3ODBiZjVkZjkyMTFlYjI2MTFlMWJiZTVkYTAwMzI1NmNiYWEwYmIuLmQ1YzBi YWFmMzA0N2I3MmE2OGM3MjE3OTY5ZmQ5Njk2YzAwNzUxZTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpA QCAtMjU3Nyw3ICsyNTc3LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDI5MCBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC9saW5lLWJyZWFrL2xpbmUKIHdlYmtpdC5vcmcv Yi8yMTQyOTAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvbGlu ZS1icmVha2luZy9saW5lLWJyZWFraW5nLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3 ZWJraXQub3JnL2IvMjE0MjkwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy10ZXh0L2xpbmUtYnJlYWtpbmcvbGluZS1icmVha2luZy0wMTYuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3MtdGV4dC9saW5lLWJyZWFraW5nL2xpbmUtYnJlYWtpbmctMDE3Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8xODMyNTggaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvbGluZS1icmVha2luZy9saW5lLWJyZWFraW5nLWlj LTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTk1MzQ1IGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L292ZXJmbG93LXdyYXAvb3Zl cmZsb3ctd3JhcC1hbnl3aGVyZS0wMDMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzE5NTM0NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4 dC9vdmVyZmxvdy13cmFwL292ZXJmbG93LXdyYXAtbWluLWNvbnRlbnQtc2l6ZS0wMDIuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MCBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC9vdmVyZmxvdy13cmFwL292ZXJmbG93LXdyYXAt bm9ybWFsLWtlZXAtYWxsLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 442105 2021-10-21 20:23:03 -0700 2021-10-21 20:23:03 -0700 Patch with dependencies Patch.txt text/plain 18618 zalan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmYzdmYTcxNzU1ZjkuLmIyNDdiNTI4NjA1YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBA CisyMDIxLTEwLTIxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBb TEZDXVtJRkNdIENoZWNrIHRoZSBwYXJlbnQgc3R5bGUgZm9yIGNvbnRlbnQgd3JhcHBpbmcgd2hl biBjb2xsZWN0aW5nIHdyYXAgb3Bwb3J0dW5pdGllcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCisyMDIxLTEwLTIx ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFk ZCBtaXNzaW5nIGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5IGNoZWNrIHdoZW4gYmV0d2VlbiB0d28g d2hpdGVzcGFjZSBpbmxpbmUgaXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzMjA1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogZmFzdC9pbmxpbmUvd2hpdGUtc3BhY2Utbm93cmFwLWFuZC1ub3Jt YWwtaW5saW5lLWJveC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2lubGlu ZS93aGl0ZS1zcGFjZS1ub3dyYXAtYW5kLW5vcm1hbC1pbmxpbmUtYm94Lmh0bWw6IEFkZGVkLgor CiAyMDIxLTEwLTIwICBBeXVtaSBLb2ppbWEgIDxheXVtaV9rb2ppbWFAYXBwbGUuY29tPgogCiAg ICAgICAgIFsgbWFjT1MgXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3hoci9ldmVu dC11cGxvYWQtcHJvZ3Jlc3MtY3Jvc3NvcmlnaW4uYW55Lmh0bWwgaXMgYSBmbGFreSBmYWlsdXJl LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3Rz L1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNTc4MGJmNWRmOTIxLi5kNWMwYmFhZjMwNDcgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVz dEV4cGVjdGF0aW9ucwpAQCAtMjU3Nyw3ICsyNTc3LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDI5MCBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC9saW5lLWJyZWFrL2xp bmUKIHdlYmtpdC5vcmcvYi8yMTQyOTAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXRleHQvbGluZS1icmVha2luZy9saW5lLWJyZWFraW5nLTAxNC5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkwIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy10ZXh0L2xpbmUtYnJlYWtpbmcvbGluZS1icmVha2luZy0wMTYuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MCBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC9saW5lLWJyZWFraW5nL2xpbmUtYnJlYWtp bmctMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8xODMyNTggaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvbGluZS1icmVha2luZy9s aW5lLWJyZWFraW5nLWljLTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn L2IvMTk1MzQ1IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L292 ZXJmbG93LXdyYXAvb3ZlcmZsb3ctd3JhcC1hbnl3aGVyZS0wMDMuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQogd2Via2l0Lm9yZy9iLzE5NTM0NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3MtdGV4dC9vdmVyZmxvdy13cmFwL292ZXJmbG93LXdyYXAtbWluLWNvbnRlbnQt c2l6ZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MCBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC9vdmVyZmxvdy13cmFw L292ZXJmbG93LXdyYXAtbm9ybWFsLWtlZXAtYWxsLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS93aGl0ZS1zcGFjZS1ub3dy 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 ZGV4IDU4ZjJlNDY4ZDNlMS4uNjgxMWNhNjcyOTkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjAg QEAKKzIwMjEtMTAtMjEgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAg IFtMRkNdW0lGQ10gQ2hlY2sgdGhlIHBhcmVudCBzdHlsZSBmb3IgY29udGVudCB3cmFwcGluZyB3 aGVuIGNvbGxlY3Rpbmcgd3JhcCBvcHBvcnR1bml0aWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwNTYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZWUgdGhlIGNvbW1lbnQgaW4gTGluZUJ1aWxkZXI6 OmhhbmRsZUlubGluZUNvbnRlbnQuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCdWlsZGVyOjpoYW5kbGVJbmxpbmVDb250ZW50KToKKworMjAyMS0xMC0yMSAgQWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgbWlz c2luZyBpc0F0U29mdFdyYXBPcHBvcnR1bml0eSBjaGVjayB3aGVuIGJldHdlZW4gdHdvIHdoaXRl c3BhY2UgaW5saW5lIGl0ZW1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzIwNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBEdWUgdG8gdGhlIGlzV3JhcHBpbmdBbGxvd2VkIGNoZWNrcyBpbiBpc0F0U29m dFdyYXBPcHBvcnR1bml0eSgpIHRvIHNwZWVkIHVwIGxpbmUgYnJlYWtpbmcsCisgICAgICAgIHdl IG1heSBlbmQgdXAgd2l0aCBhZGphY2VudCB3aGl0ZXNwYWNlIGNvbnRlbnQgd2l0aCBkaWZmZXJl bnQgd3JhcHBpbmcgc3R5bGVzIChlbWJlZGRlZCBpbiBzZXBhcmF0ZSBpbmxpbmUgYm94ZXMpLgor ICAgICAgICBlLmcuIDxzcGFuIHN0eWxlPSJ3aGl0ZS1zcGFjZTogbm8td3JhcCI+WFhYIDwvc3Bh bj48c3BhbiBzdHlsZT0id2hpdGUtc3BhY2U6IG5vcm1hbCI+IFg8L3NwYW4KKworICAgICAgICBU ZXN0OiBmYXN0L2lubGluZS93aGl0ZS1zcGFjZS1ub3dyYXAtYW5kLW5vcm1hbC1pbmxpbmUtYm94 Lmh0bWwKKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUNvbnRlbnRCcmVha2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6aXNWaXN1YWxs eUVtcHR5V2hpdGVzcGFjZUNvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6aXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkpOgorCisyMDIxLTEwLTIxICBBbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBwb3J0IGZv ciBjaGVja2luZyBsZWFkaW5nIGNvbGxhcHNpYmxlIHdoaXRlc3BhY2UgaW4gSW5saW5lQ29udGVu dEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjA5MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZW5zdXJlcyB0aGF0IHRoZSBs ZWFkaW5nIGNvbGxhcHNpYmxlIHdoaXRlc3BhY2Ugb24gdGhlIGNvbnRpbnVvdXMgcnVuIGlzIHRh a2VuCisgICAgICAgIGludG8gYWNjb3VudCB3aGVuIGNoZWNraW5nIGlmIHRoZSBvdGhlcndpc2Ug b3ZlcmZsb3dpbmcgY29udGVudCBtYXkgZml0IHRoZSBsaW5lLgorICAgICAgICBlLmcuCisgICAg ICAgIDxzcGFuIHN0eWxlPSJ3aGl0ZS1zcGFjZTogbm93cmFwIj5ub193cmFwIDwvc3Bhbj48c3Bh bj4geWVzX3dyYXA8L3NwYW4+CisgICAgICAgIFRoZSAiIHllc193cmFwIiBjb250ZW50IGhhcyBh IGNvbGxhcHNpYmxlIGxlYWRpbmcgd2hpdGVzcGFjZSBoZXJlLiAKKworICAgICAgICAqIGxheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6aXNWaXN1YWxseUVtcHR5V2hpdGVzcGFjZUNvbnRlbnQp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vz c092ZXJmbG93aW5nQ29udGVudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Oklu bGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6YXBwZW5kKToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50 OjpyZXNldCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lQ29udGVudEJyZWFrZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29u dGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjpsZWFkaW5nQ29sbGFwc2libGVXaWR0aCBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpD b250aW51b3VzQ29udGVudDo6dHJhaWxpbmdDb2xsYXBzaWJsZVdpZHRoIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250 ZW50OjpoYXNDb2xsYXBzaWJsZUNvbnRlbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OmlzRnVsbHlDb2xs YXBzaWJsZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRC cmVha2VyOjpDb250aW51b3VzQ29udGVudDo6Y29sbGFwc2libGVMb2dpY2FsV2lkdGggY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50QnJlYWtl cjo6Q29udGludW91c0NvbnRlbnQ6Om5vbkNvbGxhcHNpYmxlTG9naWNhbFdpZHRoIGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6 OkNvbnRpbnVvdXNDb250ZW50OjpoYXNUcmFpbGluZ0NvbGxhcHNpYmxlQ29udGVudCBjb25zdCk6 IERlbGV0ZWQuCisKIDIwMjEtMTAtMjAgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPiBh bmQgRGFuYSBFc3RyYSA8ZGVzdHJhQGFwcGxlLmNvbT4KIAogICAgICAgICBtYWNPUyBrZXktZHJp dmVuIHNtb290aCBzY3JvbGxpbmcgZG9lcyBub3Qgc3RvcCB3aGVuIGZvY3VzIGNoYW5nZXMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUNvbnRlbnRCcmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAppbmRleCA3NjNjYWQw YTM1ZDEuLjExZDQ3ZmVmNWNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRl bnRCcmVha2VyLmNwcApAQCAtOTcsMTUgKzk3LDE5IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1Zp c3VhbGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudChjb25zdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6 CiB7CiAgICAgLy8gWzxzcGFuPjwvc3Bhbj4gXSBbPHNwYW4+IDwvc3Bhbj5dIFsgPHNwYW4gc3R5 bGU9InBhZGRpbmc6IDBweDsiPjwvc3Bhbj5dIGFyZSBhbGwgY29uc2lkZXJlZCB2aXN1YWxseSBl bXB0eSB3aGl0ZXNwYWNlIGNvbnRlbnQuCiAgICAgLy8gWzxzcGFuIHN0eWxlPSJib3JkZXI6IDFw eCBzb2xpZCByZWQiPjwvc3Bhbj4gXSB3aGlsZSB0aGlzIGlzIHdoaXRlc3BhY2UgY29udGVudCBv bmx5LCBpdCBpcyBub3QgY29uc2lkZXJlZCB2aXN1YWxseSBlbXB0eS4KLSAgICAvLyBEdWUgdG8g Y29tbWl0IGJvdW5kYXJ5IHJ1bGVzLCB3ZSBqdXN0IG5lZWQgdG8gY2hlY2sgdGhlIGZpcnN0IG5v bi10eXBlbGVzcyBpbmxpbmUgaXRlbSAoY2FuJ3QgaGF2ZSBib3RoIFtpbWddIGFuZCBbdGV4dF0p CisgICAgQVNTRVJUKCFjb250aW51b3VzQ29udGVudC5ydW5zKCkuaXNFbXB0eSgpKTsKKyAgICBh dXRvIGhhc1doaXRlc3BhY2UgPSBmYWxzZTsKICAgICBmb3IgKGF1dG8mIHJ1biA6IGNvbnRpbnVv dXNDb250ZW50LnJ1bnMoKSkgewogICAgICAgICBhdXRvJiBpbmxpbmVJdGVtID0gcnVuLmlubGlu ZUl0ZW07Ci0gICAgICAgIC8vIEZJWE1FOiBjaGVjayBmb3IgcGFkZGluZyBib3JkZXIgZXRjLgor ICAgICAgICAvLyBGSVhNRTogY2hlY2sgaWYgdmlzdWFsIGRlY29yYXRpb24gbWFrZXMgYSBkaWZm ZXJlbmNlIGhlcmUgZS5nLiBwYWRkaW5nIGJvcmRlci4KICAgICAgICAgaWYgKGlubGluZUl0ZW0u aXNJbmxpbmVCb3hTdGFydCgpIHx8IGlubGluZUl0ZW0uaXNJbmxpbmVCb3hFbmQoKSkKICAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICByZXR1cm4gaW5saW5lSXRlbS5pc1RleHQoKSAmJiBk b3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSkuaXNXaGl0ZXNwYWNlKCk7CisgICAg ICAgIGF1dG8gaXNXaGl0ZXNwYWNlID0gaW5saW5lSXRlbS5pc1RleHQoKSAmJiBkb3duY2FzdDxJ bmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSkuaXNXaGl0ZXNwYWNlKCk7CisgICAgICAgIGlmICgh aXNXaGl0ZXNwYWNlKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBoYXNXaGl0 ZXNwYWNlID0gdHJ1ZTsKICAgICB9Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBoYXNX aGl0ZXNwYWNlOwogfQogCiBzdGF0aWMgaW5saW5lIGJvb2wgaXNOb25Db250ZW50UnVuc09ubHko Y29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50JiBjb250aW51b3Vz Q29udGVudCkKQEAgLTE3MywxNiArMTc3LDE3IEBAIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1 bHQgSW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQoY29uCiAg ICAgQVNTRVJUKCFjb250aW51b3VzQ29udGVudC5ydW5zKCkuaXNFbXB0eSgpKTsKIAogICAgIEFT U0VSVChjb250aW51b3VzQ29udGVudC5sb2dpY2FsV2lkdGgoKSA+IGxpbmVTdGF0dXMuYXZhaWxh YmxlV2lkdGgpOwotICAgIGlmIChjb250aW51b3VzQ29udGVudC5oYXNUcmFpbGluZ0NvbGxhcHNp YmxlQ29udGVudCgpKSB7Ci0gICAgICAgIEFTU0VSVChoYXNUcmFpbGluZ1RleHRDb250ZW50KG92 ZXJmbG93Q29udGVudCkpOwotICAgICAgICAvLyBGaXJzdCBjaGVjayBpZiB0aGUgY29udGVudCBm aXRzIHdpdGhvdXQgdGhlIHRyYWlsaW5nIGNvbGxhcHNpYmxlIHBhcnQuCi0gICAgICAgIGlmIChj b250aW51b3VzQ29udGVudC5ub25Db2xsYXBzaWJsZUxvZ2ljYWxXaWR0aCgpIDw9IGxpbmVTdGF0 dXMuYXZhaWxhYmxlV2lkdGgpCi0gICAgICAgICAgICByZXR1cm4geyBSZXN1bHQ6OkFjdGlvbjo6 S2VlcCwgSXNFbmRPZkxpbmU6Ok5vIH07Ci0gICAgICAgIC8vIE5vdyBjaGVjayBpZiB3ZSBjYW4g dHJpbSB0aGUgbGluZSB0b28uCi0gICAgICAgIGlmIChsaW5lU3RhdHVzLmhhc0Z1bGx5Q29sbGFw c2libGVUcmFpbGluZ1J1biAmJiBjb250aW51b3VzQ29udGVudC5pc0Z1bGx5Q29sbGFwc2libGUo KSkgeworICAgIGlmIChjb250aW51b3VzQ29udGVudC5oYXNDb2xsYXBzaWJsZUNvbnRlbnQoKSkg eworICAgICAgICBpZiAobGluZVN0YXR1cy5oYXNGdWxseUNvbGxhcHNpYmxlVHJhaWxpbmdDb250 ZW50ICYmIGNvbnRpbnVvdXNDb250ZW50LmlzRnVsbHlDb2xsYXBzaWJsZSgpKSB7CiAgICAgICAg ICAgICAvLyBJZiB0aGlzIG5ldyBjb250ZW50IGlzIGZ1bGx5IGNvbGxhcHNpYmxlLCBpdCBzaG91 bGQgc3VyZWx5IGZpdC4KICAgICAgICAgICAgIHJldHVybiB7IFJlc3VsdDo6QWN0aW9uOjpLZWVw LCBJc0VuZE9mTGluZTo6Tm8gfTsKICAgICAgICAgfQorICAgICAgICAvLyBDaGVjayBpZiB0aGUg Y29udGVudCBmaXRzIGlmIHdlIGNvbGxhcHNlZCBpdC4KKyAgICAgICAgYXV0byBzcGFjZVJlcXVp cmVkID0gY29udGludW91c0NvbnRlbnQubG9naWNhbFdpZHRoKCkgLSBjb250aW51b3VzQ29udGVu dC50cmFpbGluZ0NvbGxhcHNpYmxlV2lkdGgoKTsKKyAgICAgICAgaWYgKGxpbmVTdGF0dXMuaGFz RnVsbHlDb2xsYXBzaWJsZVRyYWlsaW5nQ29udGVudCkKKyAgICAgICAgICAgIHNwYWNlUmVxdWly ZWQgLT0gY29udGludW91c0NvbnRlbnQubGVhZGluZ0NvbGxhcHNpYmxlV2lkdGgoKTsKKyAgICAg ICAgaWYgKHNwYWNlUmVxdWlyZWQgPD0gbGluZVN0YXR1cy5hdmFpbGFibGVXaWR0aCkKKyAgICAg ICAgICAgIHJldHVybiB7IFJlc3VsdDo6QWN0aW9uOjpLZWVwLCBJc0VuZE9mTGluZTo6Tm8gfTsK ICAgICB9IGVsc2UgaWYgKGxpbmVTdGF0dXMuY29sbGFwc2libGVXaWR0aCAmJiBpc05vbkNvbnRl bnRSdW5zT25seShjb250aW51b3VzQ29udGVudCkpIHsKICAgICAgICAgLy8gTGV0J3Mgc2VlIGlm IHRoZSBub24tY29udGVudCBydW5zIGZpdCB3aGVuIHRoZSBsaW5lIGhhcyB0cmFpbGluZyBjb2xs YXBzaWJsZSBjb250ZW50LgogICAgICAgICAvLyAidGV4dCBjb250ZW50IDxzcGFuIHN0eWxlPSJw YWRkaW5nOiAxcHgiPjwvc3Bhbj4iIDwtIHRoZSA8c3Bhbj48L3NwYW4+IHJ1bnMgY291bGQgZml0 IGFmdGVyIGNvbGxhcHNpbmcgdGhlIHRyYWlsaW5nIHdoaXRlc3BhY2UuCkBAIC02NDksMjkgKzY1 NCwzMCBAQCBPcHRpb25TZXQ8SW5saW5lQ29udGVudEJyZWFrZXI6OldvcmRCcmVha1J1bGU+IElu bGluZUNvbnRlbnRCcmVha2VyOjp3b3JkQnJlYWtCZQogdm9pZCBJbmxpbmVDb250ZW50QnJlYWtl cjo6Q29udGludW91c0NvbnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVt LCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRo LCBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGNvbGxhcHNpYmxlV2lkdGgpCiB7CiAg ICAgQVNTRVJUKGlubGluZUl0ZW0uaXNUZXh0KCkgfHwgaW5saW5lSXRlbS5pc0JveCgpIHx8IGlu bGluZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpIHx8IGlubGluZUl0ZW0uaXNJbmxpbmVCb3hFbmQo KSk7CisgICAgYXV0byBpc0xlYWRpbmdDb2xsYXBzaWJsZSA9IGNvbGxhcHNpYmxlV2lkdGggJiYg KG1fcnVucy5pc0VtcHR5KCkgfHwgaXNGdWxseUNvbGxhcHNpYmxlKCkpOwogICAgIG1fcnVucy5h cHBlbmQoeyBpbmxpbmVJdGVtLCBzdHlsZSwgbG9naWNhbFdpZHRoIH0pOwogICAgIG1fbG9naWNh bFdpZHRoID0gY2xhbXBUbzxJbmxpbmVMYXlvdXRVbml0PihtX2xvZ2ljYWxXaWR0aCArIGxvZ2lj YWxXaWR0aCk7CiAgICAgaWYgKCFjb2xsYXBzaWJsZVdpZHRoKSB7CiAgICAgICAgIGlmIChpbmxp bmVJdGVtLmlzVGV4dCgpIHx8IGlubGluZUl0ZW0uaXNCb3goKSkgewogICAgICAgICAgICAgLy8g SW5saW5lIGJveGVzIGRvIG5vdCBwcmV2ZW50IHRoZSB0cmFpbGluZyBjb250ZW50IGZyb20gZ2V0 dGluZyBjb2xsYXBzZWQuCi0gICAgICAgICAgICBtX2NvbGxhcHNpYmxlTG9naWNhbFdpZHRoID0g eyB9OworICAgICAgICAgICAgbV90cmFpbGluZ0NvbGxhcHNpYmxlV2lkdGggPSB7IH07CiAgICAg ICAgIH0KICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBBU1NFUlQoKmNvbGxhcHNpYmxlV2lk dGggPD0gbG9naWNhbFdpZHRoKTsKLSAgICBpZiAoKmNvbGxhcHNpYmxlV2lkdGggPT0gbG9naWNh bFdpZHRoKSB7Ci0gICAgICAgIC8vIEZ1bGx5IGNvbGxhcHNpYmxlIHJ1bi4KLSAgICAgICAgbV9j b2xsYXBzaWJsZUxvZ2ljYWxXaWR0aCArPSBsb2dpY2FsV2lkdGg7CisgICAgaWYgKGlzTGVhZGlu Z0NvbGxhcHNpYmxlKSB7CisgICAgICAgIEFTU0VSVCghbV90cmFpbGluZ0NvbGxhcHNpYmxlV2lk dGgpOworICAgICAgICBtX2xlYWRpbmdDb2xsYXBzaWJsZVdpZHRoICs9ICpjb2xsYXBzaWJsZVdp ZHRoOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIC8vIFBhcnRpYWxseSBjb2xsYXBzaWJs ZSBydW4uCi0gICAgbV9jb2xsYXBzaWJsZUxvZ2ljYWxXaWR0aCA9ICpjb2xsYXBzaWJsZVdpZHRo OworICAgIG1fdHJhaWxpbmdDb2xsYXBzaWJsZVdpZHRoID0gKmNvbGxhcHNpYmxlV2lkdGggPT0g bG9naWNhbFdpZHRoID8gbV90cmFpbGluZ0NvbGxhcHNpYmxlV2lkdGggKyBsb2dpY2FsV2lkdGgg OiAqY29sbGFwc2libGVXaWR0aDsKIH0KIAogdm9pZCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29u dGludW91c0NvbnRlbnQ6OnJlc2V0KCkKIHsKICAgICBtX2xvZ2ljYWxXaWR0aCA9IHsgfTsKLSAg ICBtX2NvbGxhcHNpYmxlTG9naWNhbFdpZHRoID0geyB9OworICAgIG1fbGVhZGluZ0NvbGxhcHNp YmxlV2lkdGggPSB7IH07CisgICAgbV90cmFpbGluZ0NvbGxhcHNpYmxlV2lkdGggPSB7IH07CiAg ICAgbV9ydW5zLmNsZWFyKCk7CiB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5oIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVu dEJyZWFrZXIuaAppbmRleCA1NzNiYTRkOTAwYTMuLjA5YWFlOGFmZTJlZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29u dGVudEJyZWFrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5oCkBAIC03NywxMiArNzcsMTIgQEAgcHVi bGljOgogICAgIC8vIHNlZSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXRleHQtMy8jbGlu ZS1icmVhay1kZXRhaWxzCiAgICAgc3RydWN0IENvbnRpbnVvdXNDb250ZW50IHsKICAgICAgICAg SW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxX aWR0aDsgfQotICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbGxhcHNpYmxlTG9naWNhbFdpZHRo KCkgY29uc3QgeyByZXR1cm4gbV9jb2xsYXBzaWJsZUxvZ2ljYWxXaWR0aDsgfQotICAgICAgICBJ bmxpbmVMYXlvdXRVbml0IG5vbkNvbGxhcHNpYmxlTG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1 cm4gbG9naWNhbFdpZHRoKCkgLSBjb2xsYXBzaWJsZUxvZ2ljYWxXaWR0aCgpOyB9Ci0gICAgICAg IGJvb2wgaGFzVHJhaWxpbmdDb2xsYXBzaWJsZUNvbnRlbnQoKSBjb25zdCB7IHJldHVybiAhIWNv bGxhcHNpYmxlTG9naWNhbFdpZHRoKCk7IH0KLSAgICAgICAgYm9vbCBpc0Z1bGx5Q29sbGFwc2li bGUoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsV2lkdGgoKSA9PSBjb2xsYXBzaWJsZUxvZ2ljYWxX aWR0aCgpOyB9CisgICAgICAgIElubGluZUxheW91dFVuaXQgbGVhZGluZ0NvbGxhcHNpYmxlV2lk dGgoKSBjb25zdCB7IHJldHVybiBtX2xlYWRpbmdDb2xsYXBzaWJsZVdpZHRoOyB9CisgICAgICAg IElubGluZUxheW91dFVuaXQgdHJhaWxpbmdDb2xsYXBzaWJsZVdpZHRoKCkgY29uc3QgeyByZXR1 cm4gbV90cmFpbGluZ0NvbGxhcHNpYmxlV2lkdGg7IH0KKyAgICAgICAgYm9vbCBoYXNDb2xsYXBz aWJsZUNvbnRlbnQoKSBjb25zdCB7IHJldHVybiB0cmFpbGluZ0NvbGxhcHNpYmxlV2lkdGgoKSA+ IDAgfHwgbGVhZGluZ0NvbGxhcHNpYmxlV2lkdGgoKSA+IDA7IH0KKyAgICAgICAgYm9vbCBpc0Z1 bGx5Q29sbGFwc2libGUoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsV2lkdGgoKSA9PSB0cmFpbGlu Z0NvbGxhcHNpYmxlV2lkdGgoKSArIGxlYWRpbmdDb2xsYXBzaWJsZVdpZHRoKCk7IH0KIAotICAg ICAgICB2b2lkIGFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJ bmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRV bml0PiBjb2xsYXBzaWJsZVdpZHRoKTsKKyAgICAgICAgdm9pZCBhcHBlbmQoY29uc3QgSW5saW5l SXRlbSYsIGNvbnN0IFJlbmRlclN0eWxlJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgs IHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gY29sbGFwc2libGVXaWR0aCA9IHN0ZDo6 bnVsbG9wdCk7CiAgICAgICAgIHZvaWQgcmVzZXQoKTsKIAogICAgICAgICBzdHJ1Y3QgUnVuIHsK QEAgLTEwMCw3ICsxMDAsOCBAQCBwdWJsaWM6CiAgICAgcHJpdmF0ZToKICAgICAgICAgUnVuTGlz dCBtX3J1bnM7CiAgICAgICAgIElubGluZUxheW91dFVuaXQgbV9sb2dpY2FsV2lkdGggeyAwIH07 Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgbV9jb2xsYXBzaWJsZUxvZ2ljYWxXaWR0aCB7IDAg fTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2xlYWRpbmdDb2xsYXBzaWJsZVdpZHRoIHsg MCB9OworICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1fdHJhaWxpbmdDb2xsYXBzaWJsZVdpZHRo IHsgMCB9OwogICAgIH07CiAKICAgICBzdHJ1Y3QgTGluZVN0YXR1cyB7CkBAIC0xMDgsNyArMTA5 LDcgQEAgcHVibGljOgogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoIHsg MCB9OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbGxhcHNpYmxlV2lkdGggeyAwIH07CiAg ICAgICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gdHJhaWxpbmdTb2Z0SHlwaGVu V2lkdGg7Ci0gICAgICAgIGJvb2wgaGFzRnVsbHlDb2xsYXBzaWJsZVRyYWlsaW5nUnVuIHsgZmFs c2UgfTsKKyAgICAgICAgYm9vbCBoYXNGdWxseUNvbGxhcHNpYmxlVHJhaWxpbmdDb250ZW50IHsg ZmFsc2UgfTsKICAgICAgICAgYm9vbCBoYXNDb250ZW50IHsgZmFsc2UgfTsKICAgICAgICAgYm9v bCBoYXNXcmFwT3Bwb3J0dW5pdHlBdFByZXZpb3VzUG9zaXRpb24geyBmYWxzZSB9OwogICAgIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggNzEwYTgxZmJj YTE3Li5lZWFkNDFkNDNiZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRl ci5jcHAKQEAgLTkyLDEyICs5MiwxNiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFw T3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZQogICAgIGlm IChjdXJyZW50LmlzVGV4dCgpICYmIG5leHQuaXNUZXh0KCkpIHsKICAgICAgICAgYXV0byYgY3Vy cmVudElubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGN1cnJlbnQpOwog ICAgICAgICBhdXRvJiBuZXh0SW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRl bT4obmV4dCk7CisgICAgICAgIGlmIChjdXJyZW50SW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNl KCkgJiYgbmV4dElubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKSB7CisgICAgICAgICAgICAv LyA8c3Bhbj4gPC9zcGFuPjxzcGFuPiA8L3NwYW4+LiBEZXBlbmRpbmcgb24gdGhlIHN0eWxlcywg dGhlcmUgbWF5IG9yIG1heSBub3QgYmUgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkgYmV0d2VlbiB0 aGVzZSAyIHdoaXRlc3BhY2UgY29udGVudC4KKyAgICAgICAgICAgIHJldHVybiBUZXh0VXRpbDo6 aXNXcmFwcGluZ0FsbG93ZWQoY3VycmVudElubGluZVRleHRJdGVtLnN0eWxlKCkpIHx8IFRleHRV dGlsOjppc1dyYXBwaW5nQWxsb3dlZChuZXh0SW5saW5lVGV4dEl0ZW0uc3R5bGUoKSk7CisgICAg ICAgIH0KICAgICAgICAgaWYgKGN1cnJlbnRJbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSkg ewotICAgICAgICAgICAgLy8gWyBdW3RleHRdIDogYWZ0ZXIgW3doaXRlc3BhY2VdIHBvc2l0aW9u IGlzIGEgc29mdCB3cmFwIG9wcG9ydHVuaXR5LgorICAgICAgICAgICAgLy8gIiA8c3Bhbj50ZXh0 PC9zcGFuPiIgOiBhZnRlciBbd2hpdGVzcGFjZV0gcG9zaXRpb24gaXMgYSBzb2Z0IHdyYXAgb3Bw b3J0dW5pdHkuCiAgICAgICAgICAgICByZXR1cm4gVGV4dFV0aWw6OmlzV3JhcHBpbmdBbGxvd2Vk KGN1cnJlbnRJbmxpbmVUZXh0SXRlbS5zdHlsZSgpKTsKICAgICAgICAgfQogICAgICAgICBpZiAo bmV4dElubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKSB7Ci0gICAgICAgICAgICAvLyBbdGV4 dF1bIF0gKDxzcGFuPnRleHQ8L3NwYW4+ICkKKyAgICAgICAgICAgIC8vICI8c3Bhbj50ZXh0PC9z cGFuPiAiCiAgICAgICAgICAgICAvLyB3aGl0ZS1zcGFjZTogYnJlYWstc3BhY2VzOiBsaW5lIGJy ZWFraW5nIG9wcG9ydHVuaXR5IGV4aXN0cyBhZnRlciBldmVyeSBwcmVzZXJ2ZWQgd2hpdGUgc3Bh Y2UgY2hhcmFjdGVyLCBidXQgbm90IGJlZm9yZS4KICAgICAgICAgICAgIHJldHVybiBUZXh0VXRp bDo6aXNXcmFwcGluZ0FsbG93ZWQobmV4dElubGluZVRleHRJdGVtLnN0eWxlKCkpICYmIG5leHRJ bmxpbmVUZXh0SXRlbS5zdHlsZSgpLndoaXRlU3BhY2UoKSAhPSBXaGl0ZVNwYWNlOjpCcmVha1Nw YWNlczsKICAgICAgICAgfQpAQCAtNzY2LDEzICs3NzAsMjAgQEAgTGluZUJ1aWxkZXI6OlJlc3Vs dCBMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudChJbmxpbmVDb250ZW50QnJlYWtlciYg aW5saW4KICAgICAgICAgbV9saW5lTG9naWNhbFJlY3QgPSBsaW5lTG9naWNhbFJlY3RGb3JDYW5k aWRhdGVDb250ZW50OwogICAgICAgICBmb3IgKGF1dG8mIHJ1biA6IGNhbmRpZGF0ZVJ1bnMpCiAg ICAgICAgICAgICBtX2xpbmUuYXBwZW5kKHJ1bi5pbmxpbmVJdGVtLCBydW4uc3R5bGUsIHJ1bi5s b2dpY2FsV2lkdGgpOwotICAgICAgICBpZiAobGluZUNhbmRpZGF0ZS5pbmxpbmVDb250ZW50Lmhh c1RyYWlsaW5nU29mdFdyYXBPcHBvcnR1bml0eSgpKSB7Ci0gICAgICAgICAgICAvLyBDaGVjayBp ZiB3ZSBhcmUgYWxsb3dlZCB0byB3cmFwIGF0IHRoaXMgcG9zaXRpb24uCisgICAgICAgIC8vIFdl IGFyZSBrZWVwaW5nIHRoaXMgY29udGVudCBvbiB0aGUgbGluZSBidXQgd2UgbmVlZCB0byBjaGVj ayBpZiB3ZSBjb3VsZCBoYXZlIHdyYXBwZWQgaGVyZQorICAgICAgICAvLyBpbiBvcmRlciB0byBi ZSBhYmxlIHRvIHJldmVydCBiYWNrIHRvIHRoaXMgcG9zaXRvbiBpZiBuZWVkZWQuCisgICAgICAg IC8vIExldCdzIGp1c3QgaWdub3JlIGNhc2VzIGxpa2UgY29sbGFwc2VkIGxlYWRpbmcgd2hpdGVz cGFjZSBmb3Igbm93LgorICAgICAgICBpZiAobGluZUNhbmRpZGF0ZS5pbmxpbmVDb250ZW50Lmhh c1RyYWlsaW5nU29mdFdyYXBPcHBvcnR1bml0eSgpICYmIG1fbGluZS5oYXNDb250ZW50KCkpIHsK ICAgICAgICAgICAgIGF1dG8mIHRyYWlsaW5nUnVuID0gY2FuZGlkYXRlUnVucy5sYXN0KCk7Ci0g ICAgICAgICAgICAvLyBGSVhNRTogVGhlcmUgbXVzdCBiZSBhIHdheSB0byBkZWNpZGUgaWYgdGhl IHRyYWlsaW5nIHJ1biBhY3R1YWxseSBlbmRlZCB1cCBvbiB0aGUgbGluZS4KLSAgICAgICAgICAg IC8vIExldCdzIGp1c3QgZGVhbCB3aXRoIGNvbGxhcHNlZCBsZWFkaW5nIHdoaXRlc3BhY2UgZm9y IG5vdy4KLSAgICAgICAgICAgIGlmIChtX2xpbmUuaGFzQ29udGVudCgpICYmIFRleHRVdGlsOjpp c1dyYXBwaW5nQWxsb3dlZCh0cmFpbGluZ1J1bi5zdHlsZSkpCi0gICAgICAgICAgICAgICAgbV93 cmFwT3Bwb3J0dW5pdHlMaXN0LmFwcGVuZCgmdHJhaWxpbmdSdW4uaW5saW5lSXRlbSk7CisgICAg ICAgICAgICBhdXRvJiB0cmFpbGluZ0lubGluZUl0ZW0gPSB0cmFpbGluZ1J1bi5pbmxpbmVJdGVt OworICAgICAgICAgICAgLy8gTm90ZSB0aGF0IHdyYXBwaW5nIGhlcmUgY291bGQgYmUgZHJpdmVu IGJvdGggYnkgdGhlIHN0eWxlIG9mIHRoZSBwYXJlbnQgYW5kIHRoZSBpbmxpbmUgaXRlbSBpdHNl bGYuCisgICAgICAgICAgICAvLyBlLmcgaW5saW5lIGJveGVzIHNldCB0aGUgd3JhcHBpbmcgcnVs ZXMgZm9yIHRoZWlyIGNvbnRlbnQgYW5kIG5vdCBmb3IgdGhlbXNlbHZlcy4KKyAgICAgICAgICAg IGF1dG8mIHBhcmVudFN0eWxlID0gdHJhaWxpbmdJbmxpbmVJdGVtLmxheW91dEJveCgpLnBhcmVu dCgpLnN0eWxlKCk7CisgICAgICAgICAgICBhdXRvIGlzV3JhcE9wcG9ydHVuaXR5ID0gVGV4dFV0 aWw6OmlzV3JhcHBpbmdBbGxvd2VkKHBhcmVudFN0eWxlKTsKKyAgICAgICAgICAgIGlmICghaXNX cmFwT3Bwb3J0dW5pdHkgJiYgKHRyYWlsaW5nSW5saW5lSXRlbS5pc0lubGluZUJveFN0YXJ0KCkg fHwgdHJhaWxpbmdJbmxpbmVJdGVtLmlzSW5saW5lQm94RW5kKCkpKQorICAgICAgICAgICAgICAg IGlzV3JhcE9wcG9ydHVuaXR5ID0gVGV4dFV0aWw6OmlzV3JhcHBpbmdBbGxvd2VkKHRyYWlsaW5n UnVuLnN0eWxlKTsKKyAgICAgICAgICAgIGlmIChpc1dyYXBPcHBvcnR1bml0eSkKKyAgICAgICAg ICAgICAgICBtX3dyYXBPcHBvcnR1bml0eUxpc3QuYXBwZW5kKCZ0cmFpbGluZ0lubGluZUl0ZW0p OwogICAgICAgICB9CiAgICAgICAgIHJldHVybiB7IHJlc3VsdC5pc0VuZE9mTGluZSwgeyBjYW5k aWRhdGVSdW5zLnNpemUoKSwgZmFsc2UgfSB9OwogICAgIH0K