221242 2021-02-01 20:04:46 -0800 [LFC][IFC] InlineContentBreaker::processOverflowingTextContent should return the overflowing run index 2021-02-02 08:12:14 -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 1724514 0 zalan 2021-02-01 20:04:46 -0800 we need the information later to decide if the unbreakable content should stay on the current line or not. 1724521 1 418956 zalan 2021-02-01 20:52:18 -0800 Created attachment 418956 Patch 1724649 2 418995 zalan 2021-02-02 07:16:39 -0800 Created attachment 418995 Patch 1724665 3 ews-feeder 2021-02-02 08:11:44 -0800 Committed r272208: <https://trac.webkit.org/changeset/272208> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418995. 1724666 4 webkit-bug-importer 2021-02-02 08:12:14 -0800 <rdar://problem/73880597> 418956 2021-02-01 20:52:18 -0800 2021-02-02 07:16:37 -0800 Patch bug-221242-20210201205218.patch text/plain 16031 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2U3NTcxMzVkZTc2N2E4 N2VmZjNlMjFkOWNjY2I2YWM4NjFkZDYyZC4uZjdlZTk1NTcyN2I3NDU0ZjJjMmNlZjc3ZmJhYjQw ZGFkZDQ2NmM0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmVD b250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nVGV4dENvbnRlbnQgc2hvdWxkIHJldHVy biB0aGUgb3ZlcmZsb3dpbmcgcnVuIGluZGV4CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjEyNDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBzdXBwb3J0aW5n IGNvcnJlY3QgY29udGVudCB3cmFwcGluZyB3aGVuIHRoZSB1bmJyZWFrYWJsZSBjb250ZW50IGhh cyBtdWx0aXBsZSBydW5zCisgICAgICAgIGFuZCBlYWNoIHJ1biBoYXMgZGlmZmVyZW50IHdyYXBw aW5nIHJ1bGVzCisgICAgICAgIGUuZy4gPG5vd3JhcD50aGlzX2NvbnRlbnRfZG9lc19ub3Rfd3Jh cDwvbm93cmFwPmJ1dF90aGlzX2RvZXMuCisKKyAgICAgICAgSW4gdGhpcyBwYXRjaCBwcm9jZXNz T3ZlcmZsb3dpbmdUZXh0Q29udGVudCByZXR1cm5zIHRoZSBvdmVyZmxvd2luZyBydW4gaW5kZXgg c28gdGhhdCBsYXRlcgorICAgICAgICB3ZSBjYW4gdXNlIHRoaXMgaW5mb3JtYXRpb24gdG8gZGVj aWRlIGlmIHRoaXMgb3ZlcmZsb3dpbmcgY29udGVudCBzaG91bGQgc3RheSBvciBnZXQgd3JhcHBl ZCB0byB0aGUgbmV4dCBsaW5lLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lQ29udGVudEJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZs b3dpbmdUZXh0Q29udGVudCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lQ29udGVudEJyZWFrZXIuaDoKKwogMjAyMS0wMi0wMSAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gIkZpbmQgdGhlIHRyYWlsaW5n IGluZGV4IiBsb2dpYyByZXBlYXRlZCBpbiBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092 ZXJmbG93aW5nVGV4dENvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAppbmRleCBl ZTNlY2Q3OGQ0NGUwMjU0NzdhNWQwMDE0YjMzNGVlM2NhOTAyYzEyLi4xMDEzYTk2ZjEyMjMyZmYw Nzk1OTI3ZGI2NTE4ZDhiYjYwMGUzYWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuY3Bw CkBAIC0xNTksMTAgKzE1OSwxOSBAQCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGlu ZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzSW5saW5lQ29udGVudChjb25zdCBDbwogICAgIHJldHVy biByZXN1bHQ7CiB9CiAKLXN0cnVjdCBUcmFpbGluZ1RleHRDb250ZW50IHsKLSAgICBPcHRpb25h bDxzaXplX3Q+IHJ1bkluZGV4OyAvLyBJbiBzb21lIGNhc2VzIHdoZW4gdGhlIGZpcnN0IHJ1biBp cyBicmVha2FibGUgYnV0IGl0IGRvZXMgbm90IGZpdCwgdGhlcmUncyBub3QgdHJhaWxpbmcgcnVu IGluZGV4LgotICAgIGJvb2wgaGFzT3ZlcmZsb3cgeyBmYWxzZSB9OyAvLyBUcmFpbGluZyBjb250 ZW50IG92ZXJmbG93cyB0aGUgYXZhaWxhYmxlIHNwYWNlLgotICAgIE9wdGlvbmFsPElubGluZUNv bnRlbnRCcmVha2VyOjpQYXJ0aWFsUnVuPiBwYXJ0aWFsUnVuOworc3RydWN0IE92ZXJmbG93aW5n VGV4dENvbnRlbnQgeworICAgIHNpemVfdCBydW5JbmRleCB7IDAgfTsgLy8gT3ZlcmZsb3dpbmcg cnVuIGluZGV4LiBUaGVyZSdzIGFsd2F5cyBhbiBvdmVyZmxvd2luZyBydW4uCisgICAgc3RydWN0 IEJyZWFraW5nUG9zaXRpb24geworICAgICAgICBzaXplX3QgcnVuSW5kZXggeyAwIH07CisgICAg ICAgIHN0cnVjdCBUcmFpbGluZ0NvbnRlbnQgeworICAgICAgICAgICAgLy8gVHJhaWxpbmcgY29u dGVudCBpcyBlaXRoZXIgdGhlIHJ1bidzIGxlZnQgc2lkZSAod2hlbiB3ZSBicmVhayB0aGUgcnVu IHNvbWV3aGVyZSBpbiB0aGUgbWlkZGxlKSBvciB0aGUgcHJldmlvdXMgcnVuLgorICAgICAgICAg ICAgLy8gU29tZXRpbWVzIHRoZSBicmVha2luZyBwb3NpdGlvbiBpcyBhdCB0aGUgdmVyeSBiZWdp bm5pbmcgb2YgdGhlIGZpcnN0IHJ1biwgc28gdGhlcmUncyBubyB0cmFpbGluZyBydW4gYXQgYWxs LgorICAgICAgICAgICAgYm9vbCBvdmVyZmxvd3MgeyBmYWxzZSB9OworICAgICAgICAgICAgT3B0 aW9uYWw8SW5saW5lQ29udGVudEJyZWFrZXI6OlBhcnRpYWxSdW4+IHBhcnRpYWxSdW47CisgICAg ICAgIH07CisgICAgICAgIE9wdGlvbmFsPFRyYWlsaW5nQ29udGVudD4gdHJhaWxpbmdDb250ZW50 OworICAgIH07CisgICAgT3B0aW9uYWw8QnJlYWtpbmdQb3NpdGlvbj4gYnJlYWtpbmdQb3NpdGlv bjsgLy8gV2hlcmUgd2UgYWN0dWFsbHkgYnJlYWsgdGhpcyBvdmVyZmxvd2luZyBjb250ZW50Lgog fTsKIAogSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6 cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudChjb25zdCBDb250aW51b3VzQ29udGVudCYgb3ZlcmZs b3dDb250ZW50LCBjb25zdCBMaW5lU3RhdHVzJiBsaW5lU3RhdHVzKSBjb25zdApAQCAtMTk0LDI5 ICsyMDMsNDEgQEAgSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJl YWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudChjb24KICAgICB9CiAKICAgICBpZiAoaXNU ZXh0Q29udGVudChjb250aW51b3VzQ29udGVudCkpIHsKLSAgICAgICAgaWYgKGF1dG8gdHJhaWxp bmdDb250ZW50ID0gcHJvY2Vzc092ZXJmbG93aW5nVGV4dENvbnRlbnQoY29udGludW91c0NvbnRl bnQsIGxpbmVTdGF0dXMpKSB7Ci0gICAgICAgICAgICBpZiAodHJhaWxpbmdDb250ZW50LT5oYXNP dmVyZmxvdykgewotICAgICAgICAgICAgICAgIGlmICghdHJhaWxpbmdDb250ZW50LT5ydW5JbmRl eC5oYXNWYWx1ZSgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIC8vIFdlIHRyaWVkIHRvIGJyZWFr IHRoZSBjb250ZW50IGJ1dCB0aGUgYXZhaWxhYmxlIHNwYWNlIGNhbid0IGV2ZW4gYWNjb21tb2Rh dGUgdGhlIGZpcnN0IGNoYXJhY3Rlci4KLSAgICAgICAgICAgICAgICAgICAgLy8gMS4gV3JhcCB0 aGUgY29udGVudCBvdmVyIHRvIHRoZSBuZXh0IGxpbmUgd2hlbiB3ZSd2ZSBnb3QgY29udGVudCBv biB0aGUgbGluZSBhbHJlYWR5LgotICAgICAgICAgICAgICAgICAgICAvLyAyLiBLZWVwIHRoZSBm aXJzdCBjaGFyYWN0ZXIgb24gdGhlIGVtcHR5IGxpbmUgKG9yIGtlZXAgdGhlIHdob2xlIHJ1biBp ZiBpdCBoYXMgb25seSBvbmUgY2hhcmFjdGVyL2NvbXBsZXRlbHkgZW1wdHkpLgotICAgICAgICAg ICAgICAgICAgICBpZiAobGluZVN0YXR1cy5oYXNDb250ZW50KQotICAgICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OldyYXAsIElzRW5kT2ZMaW5lOjpZZXMgfTsK LSAgICAgICAgICAgICAgICAgICAgYXV0byBsZWFkaW5nVGV4dFJ1bkluZGV4ID0gKmZpcnN0VGV4 dFJ1bkluZGV4KGNvbnRpbnVvdXNDb250ZW50KTsKLSAgICAgICAgICAgICAgICAgICAgYXV0byYg aW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oY29udGludW91c0NvbnRl bnQucnVucygpW2xlYWRpbmdUZXh0UnVuSW5kZXhdLmlubGluZUl0ZW0pOwotICAgICAgICAgICAg ICAgICAgICBpZiAoaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCkgPD0gMSkKLSAgICAgICAgICAgICAg ICAgICAgICAgIHJldHVybiBSZXN1bHQgeyBSZXN1bHQ6OkFjdGlvbjo6S2VlcCwgSXNFbmRPZkxp bmU6OlllcyB9OwotICAgICAgICAgICAgICAgICAgICBhdXRvIGZpcnN0Q2hhcmFjdGVyV2lkdGgg PSBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGlubGluZVRleHRJdGVtLnN0YXJ0KCks IGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyAxLCBsaW5lU3RhdHVzLmNvbnRlbnRMb2dpY2FsUmln aHQpOwotICAgICAgICAgICAgICAgICAgICBhdXRvIGZpcnN0Q2hhcmFjdGVyUnVuID0gUGFydGlh bFJ1biB7IDEsIGZpcnN0Q2hhcmFjdGVyV2lkdGggfTsKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIHsgUmVzdWx0OjpBY3Rpb246OkJyZWFrLCBJc0VuZE9mTGluZTo6WWVzLCBSZXN1bHQ6OlBh cnRpYWxUcmFpbGluZ0NvbnRlbnQgeyBsZWFkaW5nVGV4dFJ1bkluZGV4LCBmaXJzdENoYXJhY3Rl clJ1biB9IH07Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIC8vIFdlIG1hbmFn ZWQgdG8gYnJlYWsgYSBydW4gd2l0aCBvdmVyZmxvdy4gU2hvdWxkIG5vdCBrZWVwIHRoaXMgb24g dGhlIGxpbmUgdW5sZXNzIGl0J3MgdGhlIG9ubHkgY29udGVudC4KKyAgICAgICAgYXV0byB0cnlC cmVha2luZ1RleHRDb250ZW50ID0gWyZdKCkgLT4gT3B0aW9uYWw8UmVzdWx0PiB7CisgICAgICAg ICAgICAvLyAxLiBUaGlzIHRleHQgY29udGVudCBpcyBub3QgYnJlYWthYmxlLgorICAgICAgICAg ICAgLy8gMi4gVGhpcyBicmVha2FibGUgdGV4dCBjb250ZW50IGRvZXMgbm90IGZpdCBhdCBhbGwu IE5vdCBldmVuIHRoZSBmaXJzdCBnbHlwaC4gVGhpcyBpcyBhIHZlcnkgc3BlY2lhbCBjYXNlLgor ICAgICAgICAgICAgLy8gMy4gV2UgY2FuIGJyZWFrIHRoZSBjb250ZW50IGJ1dCBpdCBzdGlsbCBv dmVyZmxvd3MuCisgICAgICAgICAgICAvLyA0LiBNYW5hZ2VkIHRvIGJyZWFrIHRoZSBjb250ZW50 IGJlZm9yZSB0aGUgb3ZlcmZsb3cgcG9pbnQuCisgICAgICAgICAgICBhdXRvIG92ZXJmbG93aW5n Q29udGVudCA9IHByb2Nlc3NPdmVyZmxvd2luZ1RleHRDb250ZW50KGNvbnRpbnVvdXNDb250ZW50 LCBsaW5lU3RhdHVzKTsKKyAgICAgICAgICAgIGlmICghb3ZlcmZsb3dpbmdDb250ZW50LmJyZWFr aW5nUG9zaXRpb24pCisgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKKyAgICAgICAgICAgIGF1 dG8gdHJhaWxpbmdDb250ZW50ID0gb3ZlcmZsb3dpbmdDb250ZW50LmJyZWFraW5nUG9zaXRpb24t PnRyYWlsaW5nQ29udGVudDsKKyAgICAgICAgICAgIGlmICghdHJhaWxpbmdDb250ZW50KSB7Cisg ICAgICAgICAgICAgICAgLy8gV2UgdHJpZWQgdG8gYnJlYWsgdGhlIGNvbnRlbnQgYnV0IHRoZSBh dmFpbGFibGUgc3BhY2UgY2FuJ3QgZXZlbiBhY2NvbW1vZGF0ZSB0aGUgZmlyc3QgZ2x5cGguCisg ICAgICAgICAgICAgICAgLy8gMS4gV3JhcCB0aGUgY29udGVudCBvdmVyIHRvIHRoZSBuZXh0IGxp bmUgd2hlbiB3ZSd2ZSBnb3QgY29udGVudCBvbiB0aGUgbGluZSBhbHJlYWR5LgorICAgICAgICAg ICAgICAgIC8vIDIuIEtlZXAgdGhlIGZpcnN0IGdseXBoIG9uIHRoZSBlbXB0eSBsaW5lIChvciBr ZWVwIHRoZSB3aG9sZSBydW4gaWYgaXQgaGFzIG9ubHkgb25lIGdseXBoL2NvbXBsZXRlbHkgZW1w dHkpLgogICAgICAgICAgICAgICAgIGlmIChsaW5lU3RhdHVzLmhhc0NvbnRlbnQpCi0gICAgICAg ICAgICAgICAgICAgIHJldHVybiB7IFJlc3VsdDo6QWN0aW9uOjpXcmFwLCBJc0VuZE9mTGluZTo6 WWVzIH07CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBSZXN1bHQgeyBSZXN1bHQ6OkFjdGlv bjo6V3JhcCwgSXNFbmRPZkxpbmU6OlllcywgeyB9LCB7IH0gfTsKKyAgICAgICAgICAgICAgICBh dXRvIGxlYWRpbmdUZXh0UnVuSW5kZXggPSAqZmlyc3RUZXh0UnVuSW5kZXgoY29udGludW91c0Nv bnRlbnQpOworICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8 SW5saW5lVGV4dEl0ZW0+KGNvbnRpbnVvdXNDb250ZW50LnJ1bnMoKVtsZWFkaW5nVGV4dFJ1bklu ZGV4XS5pbmxpbmVJdGVtKTsKKyAgICAgICAgICAgICAgICBpZiAoaW5saW5lVGV4dEl0ZW0ubGVu Z3RoKCkgPD0gMSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFJlc3VsdCB7IFJlc3VsdDo6 QWN0aW9uOjpLZWVwLCBJc0VuZE9mTGluZTo6WWVzLCB7IH0sIHsgfSB9OworICAgICAgICAgICAg ICAgIGF1dG8gZmlyc3RDaGFyYWN0ZXJXaWR0aCA9IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0 SXRlbSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSArIDEs IGxpbmVTdGF0dXMuY29udGVudExvZ2ljYWxSaWdodCk7CisgICAgICAgICAgICAgICAgYXV0byBm aXJzdENoYXJhY3RlclJ1biA9IFBhcnRpYWxSdW4geyAxLCBmaXJzdENoYXJhY3RlcldpZHRoIH07 CisgICAgICAgICAgICAgICAgcmV0dXJuIFJlc3VsdCB7IFJlc3VsdDo6QWN0aW9uOjpCcmVhaywg SXNFbmRPZkxpbmU6OlllcywgUmVzdWx0OjpQYXJ0aWFsVHJhaWxpbmdDb250ZW50IHsgbGVhZGlu Z1RleHRSdW5JbmRleCwgZmlyc3RDaGFyYWN0ZXJSdW4gfSwgeyB9IH07CiAgICAgICAgICAgICB9 Ci0gICAgICAgICAgICBhdXRvIHRyYWlsaW5nUGFydGlhbENvbnRlbnQgPSBSZXN1bHQ6OlBhcnRp YWxUcmFpbGluZ0NvbnRlbnQgeyAqdHJhaWxpbmdDb250ZW50LT5ydW5JbmRleCwgdHJhaWxpbmdD b250ZW50LT5wYXJ0aWFsUnVuIH07Ci0gICAgICAgICAgICByZXR1cm4geyBSZXN1bHQ6OkFjdGlv bjo6QnJlYWssIElzRW5kT2ZMaW5lOjpZZXMsIHRyYWlsaW5nUGFydGlhbENvbnRlbnQgfTsgICAg ICAgIH0KKyAgICAgICAgICAgIGlmICh0cmFpbGluZ0NvbnRlbnQtPm92ZXJmbG93cyAmJiBsaW5l U3RhdHVzLmhhc0NvbnRlbnQpIHsKKyAgICAgICAgICAgICAgICAvLyBXZSBtYW5hZ2VkIHRvIGJy ZWFrIGEgcnVuIHdpdGggb3ZlcmZsb3cgYnV0IHRoZSBsaW5lIGFscmVhZHkgaGFzIGNvbnRlbnQu IExldCdzIHdyYXAgaXQgdG8gdGhlIG5leHQgbGluZS4KKyAgICAgICAgICAgICAgICByZXR1cm4g UmVzdWx0IHsgUmVzdWx0OjpBY3Rpb246OldyYXAsIElzRW5kT2ZMaW5lOjpZZXMsIHsgfSwgeyB9 IH07CisgICAgICAgICAgICB9CisgICAgICAgICAgICAvLyBFaXRoZXIgd2UgbWFuYWdlZCB0byBi cmVhayB3aXRoIG5vIG92ZXJmbG93IG9yIHRoZSBsaW5lIGlzIGVtcHR5LgorICAgICAgICAgICAg YXV0byB0cmFpbGluZ1BhcnRpYWxDb250ZW50ID0gUmVzdWx0OjpQYXJ0aWFsVHJhaWxpbmdDb250 ZW50IHsgb3ZlcmZsb3dpbmdDb250ZW50LmJyZWFraW5nUG9zaXRpb24tPnJ1bkluZGV4LCB0cmFp bGluZ0NvbnRlbnQtPnBhcnRpYWxSdW4gfTsKKyAgICAgICAgICAgIHJldHVybiBSZXN1bHQgeyBS ZXN1bHQ6OkFjdGlvbjo6QnJlYWssIElzRW5kT2ZMaW5lOjpZZXMsIHRyYWlsaW5nUGFydGlhbENv bnRlbnQsIHsgfSB9OworICAgICAgICB9OworICAgICAgICBpZiAoYXV0byByZXN1bHQgPSB0cnlC cmVha2luZ1RleHRDb250ZW50KCkpCisgICAgICAgICAgICByZXR1cm4gKnJlc3VsdDsKICAgICB9 CisKICAgICAvLyBJZiB3ZSBhcmUgbm90IGFsbG93ZWQgdG8gYnJlYWsgdGhpcyBvdmVyZmxvd2lu ZyBjb250ZW50LCB3ZSBzdGlsbCBuZWVkIHRvIGRlY2lkZSB3aGV0aGVyIGtlZXAgaXQgb3Igd3Jh cCBpdCB0byB0aGUgbmV4dCBsaW5lLgogICAgIGlmICghbGluZVN0YXR1cy5oYXNDb250ZW50KSB7 CiAgICAgICAgIEFTU0VSVCghbV9oYXNXcmFwT3Bwb3J0dW5pdHlBdFByZXZpb3VzUG9zaXRpb24p OwpAQCAtMjU2LDcgKzI3Nyw3IEBAIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgSW5saW5l Q29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQoY29uCiAgICAgcmV0dXJu IHsgUmVzdWx0OjpBY3Rpb246OktlZXAsIElzRW5kT2ZMaW5lOjpObyB9OwogfQogCi1PcHRpb25h bDxUcmFpbGluZ1RleHRDb250ZW50PiBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJm bG93aW5nVGV4dENvbnRlbnQoY29uc3QgQ29udGludW91c0NvbnRlbnQmIGNvbnRpbnVvdXNDb250 ZW50LCBjb25zdCBMaW5lU3RhdHVzJiBsaW5lU3RhdHVzKSBjb25zdAorT3ZlcmZsb3dpbmdUZXh0 Q29udGVudCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nVGV4dENvbnRl bnQoY29uc3QgQ29udGludW91c0NvbnRlbnQmIGNvbnRpbnVvdXNDb250ZW50LCBjb25zdCBMaW5l U3RhdHVzJiBsaW5lU3RhdHVzKSBjb25zdAogewogICAgIGF1dG8mIHJ1bnMgPSBjb250aW51b3Vz Q29udGVudC5ydW5zKCk7CiAgICAgQVNTRVJUKCFydW5zLmlzRW1wdHkoKSk7CkBAIC0zMDIsMjcg KzMyMywyNyBAQCBPcHRpb25hbDxUcmFpbGluZ1RleHRDb250ZW50PiBJbmxpbmVDb250ZW50QnJl YWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nVGV4dENvbnRlbgogICAgIC8vIFdlIGhhdmUgdG8gaGF2 ZSBhbiBvdmVyZmxvd2luZyBydW4uCiAgICAgUkVMRUFTRV9BU1NFUlQob3ZlcmZsb3dpbmdSdW5J bmRleCA8IHJ1bnMuc2l6ZSgpKTsKIAotICAgIGF1dG8gdHJ5QnJlYWtpbmdPdmVyZmxvd2luZ1J1 biA9IFsmXSgpIC0+IE9wdGlvbmFsPFRyYWlsaW5nVGV4dENvbnRlbnQ+IHsKKyAgICBhdXRvIHRy eUJyZWFraW5nT3ZlcmZsb3dpbmdSdW4gPSBbJl0oKSAtPiBPcHRpb25hbDxPdmVyZmxvd2luZ1Rl eHRDb250ZW50OjpCcmVha2luZ1Bvc2l0aW9uPiB7CiAgICAgICAgIGF1dG8gb3ZlcmZsb3dpbmdS dW4gPSBydW5zW292ZXJmbG93aW5nUnVuSW5kZXhdOwogICAgICAgICBpZiAoIWlzQnJlYWthYmxl UnVuKG92ZXJmbG93aW5nUnVuKSkKICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAgIGlm IChhdXRvIHBhcnRpYWxSdW4gPSB0cnlCcmVha2luZ1RleHRSdW4ob3ZlcmZsb3dpbmdSdW4sIGxp bmVTdGF0dXMuY29udGVudExvZ2ljYWxSaWdodCArIGFjY3VtdWxhdGVkQ29udGVudFdpZHRoLCBz dGQ6Om1heCgwLjBmLCBsaW5lU3RhdHVzLmF2YWlsYWJsZVdpZHRoIC0gYWNjdW11bGF0ZWRDb250 ZW50V2lkdGgpKSkgewogICAgICAgICAgICAgaWYgKHBhcnRpYWxSdW4tPmxlbmd0aCkKLSAgICAg ICAgICAgICAgICByZXR1cm4gVHJhaWxpbmdUZXh0Q29udGVudCB7IG92ZXJmbG93aW5nUnVuSW5k ZXgsIGZhbHNlLCBwYXJ0aWFsUnVuIH07CisgICAgICAgICAgICAgICAgcmV0dXJuIE92ZXJmbG93 aW5nVGV4dENvbnRlbnQ6OkJyZWFraW5nUG9zaXRpb24geyBvdmVyZmxvd2luZ1J1bkluZGV4LCBP dmVyZmxvd2luZ1RleHRDb250ZW50OjpCcmVha2luZ1Bvc2l0aW9uOjpUcmFpbGluZ0NvbnRlbnQg eyBmYWxzZSwgcGFydGlhbFJ1biB9IH07CiAgICAgICAgICAgICAvLyBXaGVuIHRoZSBicmVha2lu ZyBwb3NpdGlvbiBpcyBhdCB0aGUgYmVnaW5uaW5nIG9mIHRoZSBydW4sIHRoZSB0cmFpbGluZyBy dW4gaXMgdGhlIHByZXZpb3VzIG9uZS4KICAgICAgICAgICAgIGlmIChhdXRvIHRyYWlsaW5nUnVu SW5kZXggPSBmaW5kVHJhaWxpbmdSdW5JbmRleChvdmVyZmxvd2luZ1J1bkluZGV4KSkKLSAgICAg ICAgICAgICAgICByZXR1cm4gVHJhaWxpbmdUZXh0Q29udGVudCB7ICp0cmFpbGluZ1J1bkluZGV4 LCBmYWxzZSwgeyB9IH07CisgICAgICAgICAgICAgICAgcmV0dXJuIE92ZXJmbG93aW5nVGV4dENv bnRlbnQ6OkJyZWFraW5nUG9zaXRpb24geyAqdHJhaWxpbmdSdW5JbmRleCwgT3ZlcmZsb3dpbmdU ZXh0Q29udGVudDo6QnJlYWtpbmdQb3NpdGlvbjo6VHJhaWxpbmdDb250ZW50IHsgfSB9OwogICAg ICAgICAgICAgLy8gU29tZXRpbWVzIHdlIGNhbid0IGFjY29tbW9kYXRlIGV2ZW4gdGhlIHZlcnkg Zmlyc3QgY2hhcmFjdGVyLiAKICAgICAgICAgICAgIC8vIE5vdGUgdGhhdCB0aGlzIGlzIGRpZmZl cmVudCBmcm9tIHdoZW4gdGhlcmUncyBubyBicmVha2FibGUgcnVuIGluIHRoaXMgc2V0LgotICAg ICAgICAgICAgcmV0dXJuIFRyYWlsaW5nVGV4dENvbnRlbnQgeyB7IH0sIHRydWUsIHsgfSB9Owor ICAgICAgICAgICAgcmV0dXJuIE92ZXJmbG93aW5nVGV4dENvbnRlbnQ6OkJyZWFraW5nUG9zaXRp b24geyAwLCB7IH0gfTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4geyB9OwogICAgIH07CiAg ICAgLy8gQ2hlY2sgaWYgd2UgYWN0dWFsbHkgYnJlYWsgdGhpcyBydW4uCi0gICAgaWYgKGF1dG8g dHJhaWxpbmdDb250ZW50ID0gdHJ5QnJlYWtpbmdPdmVyZmxvd2luZ1J1bigpKQotICAgICAgICBy ZXR1cm4gdHJhaWxpbmdDb250ZW50OworICAgIGlmIChhdXRvIGJyZWFraW5nUG9zaXRpb24gPSB0 cnlCcmVha2luZ092ZXJmbG93aW5nUnVuKCkpCisgICAgICAgIHJldHVybiB7IG92ZXJmbG93aW5n UnVuSW5kZXgsIGJyZWFraW5nUG9zaXRpb24gfTsKIAotICAgIGF1dG8gdHJ5QnJlYWtpbmdQcmV2 aW91c05vbk92ZXJmbG93aW5nUnVucyA9IFsmXSgpIC0+IE9wdGlvbmFsPFRyYWlsaW5nVGV4dENv bnRlbnQ+IHsKKyAgICBhdXRvIHRyeUJyZWFraW5nUHJldmlvdXNOb25PdmVyZmxvd2luZ1J1bnMg PSBbJl0oKSAtPiBPcHRpb25hbDxPdmVyZmxvd2luZ1RleHRDb250ZW50OjpCcmVha2luZ1Bvc2l0 aW9uPiB7CiAgICAgICAgIGF1dG8gcHJldmlvdXNDb250ZW50V2lkdGggPSBhY2N1bXVsYXRlZENv bnRlbnRXaWR0aDsKICAgICAgICAgZm9yIChhdXRvIGluZGV4ID0gb3ZlcmZsb3dpbmdSdW5JbmRl eDsgaW5kZXgtLTspIHsKICAgICAgICAgICAgIGF1dG8mIHJ1biA9IHJ1bnNbaW5kZXhdOwpAQCAt MzMyLDIwICszNTMsMjAgQEAgT3B0aW9uYWw8VHJhaWxpbmdUZXh0Q29udGVudD4gSW5saW5lQ29u dGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ1RleHRDb250ZW4KICAgICAgICAgICAgIEFT U0VSVChydW4uaW5saW5lSXRlbS5pc1RleHQoKSk7CiAgICAgICAgICAgICBpZiAoYXV0byBwYXJ0 aWFsUnVuID0gdHJ5QnJlYWtpbmdUZXh0UnVuKHJ1biwgbGluZVN0YXR1cy5jb250ZW50TG9naWNh bFJpZ2h0ICsgcHJldmlvdXNDb250ZW50V2lkdGgsIHsgfSkpIHsKICAgICAgICAgICAgICAgICAv LyBXZSBrbm93IHRoaXMgcnVuIGZpdHMsIHNvIGlmIGJyZWFraW5nIGlzIGFsbG93ZWQgb24gdGhl IHJ1biwgaXQgc2hvdWxkIHJldHVybiBhIG5vbi1lbXB0eSBsZWZ0LXNpZGUKLSAgICAgICAgICAg ICAgICAvLyBzaW5jZSBpdCdzIGVpdGhlciBhdCBoeXBlbiBwb3NpdGlvbiBvciB0aGUgZW50aXJl IHJ1biBpcyByZXR1cm5lZC4KKyAgICAgICAgICAgICAgICAvLyBzaW5jZSBpdCdzIGVpdGhlciBh dCBoeXBoZW4gcG9zaXRpb24gb3IgdGhlIGVudGlyZSBydW4gaXMgcmV0dXJuZWQuCiAgICAgICAg ICAgICAgICAgQVNTRVJUKHBhcnRpYWxSdW4tPmxlbmd0aCk7CiAgICAgICAgICAgICAgICAgYXV0 byBydW5Jc0Z1bGx5QWNjb21tb2RhdGVkID0gcGFydGlhbFJ1bi0+bGVuZ3RoID09IGRvd25jYXN0 PElubGluZVRleHRJdGVtPihydW4uaW5saW5lSXRlbSkubGVuZ3RoKCk7Ci0gICAgICAgICAgICAg ICAgcmV0dXJuIFRyYWlsaW5nVGV4dENvbnRlbnQgeyBpbmRleCwgZmFsc2UsIHJ1bklzRnVsbHlB Y2NvbW1vZGF0ZWQgPyBXVEY6Om51bGxvcHQgOiBwYXJ0aWFsUnVuIH07CisgICAgICAgICAgICAg ICAgcmV0dXJuIE92ZXJmbG93aW5nVGV4dENvbnRlbnQ6OkJyZWFraW5nUG9zaXRpb24geyBpbmRl eCwgT3ZlcmZsb3dpbmdUZXh0Q29udGVudDo6QnJlYWtpbmdQb3NpdGlvbjo6VHJhaWxpbmdDb250 ZW50IHsgZmFsc2UsIHJ1bklzRnVsbHlBY2NvbW1vZGF0ZWQgPyBXVEY6Om51bGxvcHQgOiBwYXJ0 aWFsUnVuIH0gfTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICByZXR1cm4geyB9 OwogICAgIH07CiAgICAgLy8gV2UgZGlkIG5vdCBtYW5hZ2UgdG8gYnJlYWsgdGhlIHJ1biB0aGF0 IGFjdHVhbGx5IG92ZXJmbG93cyB0aGUgbGluZS4KICAgICAvLyBMZXQncyB0cnkgdG8gZmluZCBh IHByZXZpb3VzIGJyZWFraW5nIHBvc2l0aW9uIHN0YXJ0aW5nIGZyb20gdGhlIG92ZXJmbG93aW5n IHJ1bi4gSXQgc3VyZWx5IGZpdHMuCi0gICAgaWYgKGF1dG8gdHJhaWxpbmdDb250ZW50ID0gdHJ5 QnJlYWtpbmdQcmV2aW91c05vbk92ZXJmbG93aW5nUnVucygpKQotICAgICAgICByZXR1cm4gdHJh aWxpbmdDb250ZW50OworICAgIGlmIChhdXRvIGJyZWFraW5nUG9zaXRpb24gPSB0cnlCcmVha2lu Z1ByZXZpb3VzTm9uT3ZlcmZsb3dpbmdSdW5zKCkpCisgICAgICAgIHJldHVybiB7IG92ZXJmbG93 aW5nUnVuSW5kZXgsIGJyZWFraW5nUG9zaXRpb24gfTsKIAotICAgIGF1dG8gdHJ5QnJlYWtpbmdO ZXh0T3ZlcmZsb3dpbmdSdW5zID0gWyZdKCkgLT4gT3B0aW9uYWw8VHJhaWxpbmdUZXh0Q29udGVu dD4geworICAgIGF1dG8gdHJ5QnJlYWtpbmdOZXh0T3ZlcmZsb3dpbmdSdW5zID0gWyZdKCkgLT4g T3B0aW9uYWw8T3ZlcmZsb3dpbmdUZXh0Q29udGVudDo6QnJlYWtpbmdQb3NpdGlvbj4gewogICAg ICAgICBhdXRvIG5leHRDb250ZW50V2lkdGggPSBhY2N1bXVsYXRlZENvbnRlbnRXaWR0aCArIHJ1 bnNbb3ZlcmZsb3dpbmdSdW5JbmRleF0ubG9naWNhbFdpZHRoOwogICAgICAgICBmb3IgKGF1dG8g aW5kZXggPSBvdmVyZmxvd2luZ1J1bkluZGV4ICsgMTsgaW5kZXggPCBydW5zLnNpemUoKTsgKytp bmRleCkgewogICAgICAgICAgICAgYXV0byYgcnVuID0gcnVuc1tpbmRleF07CkBAIC0zNjEsMTIg KzM4MiwxMiBAQCBPcHRpb25hbDxUcmFpbGluZ1RleHRDb250ZW50PiBJbmxpbmVDb250ZW50QnJl YWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nVGV4dENvbnRlbgogICAgICAgICAgICAgICAgICAgICBB U1NFUlQodHJhaWxpbmdSdW5JbmRleCk7CiAgICAgICAgICAgICAgICAgICAgIC8vIEF0IHdvcnN0 IHdlIGFyZSBiYWNrIHRvIHRoZSBvdmVyZmxvd2luZyBydW4sIGxpa2UgaW4gdGhlIGV4YW1wbGUg YWJvdmUuCiAgICAgICAgICAgICAgICAgICAgIEFTU0VSVCgqdHJhaWxpbmdSdW5JbmRleCA+PSBv dmVyZmxvd2luZ1J1bkluZGV4KTsKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFRyYWlsaW5n VGV4dENvbnRlbnQgeyAqdHJhaWxpbmdSdW5JbmRleCwgdHJ1ZSwgeyB9IH07CisgICAgICAgICAg ICAgICAgICAgIHJldHVybiBPdmVyZmxvd2luZ1RleHRDb250ZW50OjpCcmVha2luZ1Bvc2l0aW9u IHsgKnRyYWlsaW5nUnVuSW5kZXgsIE92ZXJmbG93aW5nVGV4dENvbnRlbnQ6OkJyZWFraW5nUG9z aXRpb246OlRyYWlsaW5nQ29udGVudCB7IHRydWUsIHsgfSB9IH07CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIGlmIChhdXRvIHBhcnRpYWxSdW4gPSB0cnlCcmVha2luZ1RleHRS dW4ocnVuLCBsaW5lU3RhdHVzLmNvbnRlbnRMb2dpY2FsUmlnaHQgKyBuZXh0Q29udGVudFdpZHRo LCB7IH0pKSB7CiAgICAgICAgICAgICAgICAgICAgIEFTU0VSVChwYXJ0aWFsUnVuLT5sZW5ndGgp OwogICAgICAgICAgICAgICAgICAgICAvLyBXZSBtYW5hZ2VkIHRvIGJyZWFrIHRoaXMgdGV4dCBy dW4gbWlkIGNvbnRlbnQuIEl0IGhhcyB0byBiZSBhIGh5cGhlbiBicmVhay4KLSAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIFRyYWlsaW5nVGV4dENvbnRlbnQgeyBpbmRleCwgdHJ1ZSwgcGFydGlh bFJ1biB9OworICAgICAgICAgICAgICAgICAgICByZXR1cm4gT3ZlcmZsb3dpbmdUZXh0Q29udGVu dDo6QnJlYWtpbmdQb3NpdGlvbiB7IGluZGV4LCBPdmVyZmxvd2luZ1RleHRDb250ZW50OjpCcmVh a2luZ1Bvc2l0aW9uOjpUcmFpbGluZ0NvbnRlbnQgeyB0cnVlLCBwYXJ0aWFsUnVuIH0gfTsKICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBuZXh0Q29udGVudFdp ZHRoICs9IHJ1bi5sb2dpY2FsV2lkdGg7CkBAIC0zNzYsOCArMzk3LDggQEAgT3B0aW9uYWw8VHJh aWxpbmdUZXh0Q29udGVudD4gSW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2lu Z1RleHRDb250ZW4KICAgICAvLyBBdCB0aGlzIHBvaW50IHdlIGtub3cgdGhhdCB0aGVyZSdzIG5v IGJyZWFrYWJsZSBydW4gYWxsIHRoZSB3YXkgdG8gdGhlIG92ZXJmbG93aW5nIHJ1bi4KICAgICAv LyBOb3cgd2UgbmVlZCB0byBjaGVjayBpZiBhbnkgcnVuIGFmdGVyIHRoZSBvdmVyZmxvd2luZyBj b250ZW50IGNhbiBicmVhay4KICAgICAvLyBlLmcuIDxzcGFuPnRoaXNfY29udGVudF9vdmVyZmxv d3NfYnV0X25vdF9icmVha2FibGU8c3Bhbj48c3BhbiBzdHlsZT0id29yZC1icmVhazogYnJlYWst YWxsIj5idXRfdGhpc19pc19icmVha2FibGU8L3NwYW4+Ci0gICAgaWYgKGF1dG8gdHJhaWxpbmdD b250ZW50ID0gdHJ5QnJlYWtpbmdOZXh0T3ZlcmZsb3dpbmdSdW5zKCkpCi0gICAgICAgIHJldHVy biB0cmFpbGluZ0NvbnRlbnQ7CisgICAgaWYgKGF1dG8gYnJlYWtpbmdQb3NpdGlvbiA9IHRyeUJy ZWFraW5nTmV4dE92ZXJmbG93aW5nUnVucygpKQorICAgICAgICByZXR1cm4geyBvdmVyZmxvd2lu Z1J1bkluZGV4LCBicmVha2luZ1Bvc2l0aW9uIH07CiAKICAgICAvLyBHaXZlIHVwLCB0aGVyZSdz IG5vIGJyZWFrYWJsZSBydW4gaW4gaGVyZS4KICAgICByZXR1cm4geyB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFr ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRl bnRCcmVha2VyLmgKaW5kZXggYWNkMzE2YmMxODcxZjNjMWY4YzY2MjI5Yjk4NjdjYjU3OTBhNzQy NS4uNTQzYWM0ZmUyMzY3YzJjNDRhYmFkZjdhNTEwN2U0ZjkzOTgzOTQ2ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFr ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVD b250ZW50QnJlYWtlci5oCkBAIC0zNiw3ICszNiw3IEBAIGNsYXNzIFJlbmRlclN0eWxlOwogbmFt ZXNwYWNlIExheW91dCB7CiAKIGNsYXNzIElubGluZUl0ZW07Ci1zdHJ1Y3QgVHJhaWxpbmdUZXh0 Q29udGVudDsKK3N0cnVjdCBPdmVyZmxvd2luZ1RleHRDb250ZW50OwogCiBjbGFzcyBJbmxpbmVD b250ZW50QnJlYWtlciB7CiBwdWJsaWM6CkBAIC0xMTgsNyArMTE4LDcgQEAgcHVibGljOgogCiBw cml2YXRlOgogICAgIFJlc3VsdCBwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50KGNvbnN0IENvbnRp bnVvdXNDb250ZW50JiwgY29uc3QgTGluZVN0YXR1cyYpIGNvbnN0OwotICAgIE9wdGlvbmFsPFRy YWlsaW5nVGV4dENvbnRlbnQ+IHByb2Nlc3NPdmVyZmxvd2luZ1RleHRDb250ZW50KGNvbnN0IENv bnRpbnVvdXNDb250ZW50JiwgY29uc3QgTGluZVN0YXR1cyYpIGNvbnN0OworICAgIE92ZXJmbG93 aW5nVGV4dENvbnRlbnQgcHJvY2Vzc092ZXJmbG93aW5nVGV4dENvbnRlbnQoY29uc3QgQ29udGlu dW91c0NvbnRlbnQmLCBjb25zdCBMaW5lU3RhdHVzJikgY29uc3Q7CiAgICAgT3B0aW9uYWw8UGFy dGlhbFJ1bj4gdHJ5QnJlYWtpbmdUZXh0UnVuKGNvbnN0IENvbnRpbnVvdXNDb250ZW50OjpSdW4m IG92ZXJmbG93UnVuLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBPcHRpb25hbDxJbmxp bmVMYXlvdXRVbml0PiBhdmFpbGFibGVXaWR0aCkgY29uc3Q7CiAKICAgICBlbnVtIGNsYXNzIFdv cmRCcmVha1J1bGUgewo= 418995 2021-02-02 07:16:39 -0800 2021-02-02 08:11:44 -0800 Patch bug-221242-20210202071638.patch text/plain 16144 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2U3NTcxMzVkZTc2N2E4 N2VmZjNlMjFkOWNjY2I2YWM4NjFkZDYyZC4uZjdlZTk1NTcyN2I3NDU0ZjJjMmNlZjc3ZmJhYjQw ZGFkZDQ2NmM0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmVD b250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nVGV4dENvbnRlbnQgc2hvdWxkIHJldHVy biB0aGUgb3ZlcmZsb3dpbmcgcnVuIGluZGV4CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjEyNDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBzdXBwb3J0aW5n IGNvcnJlY3QgY29udGVudCB3cmFwcGluZyB3aGVuIHRoZSB1bmJyZWFrYWJsZSBjb250ZW50IGhh cyBtdWx0aXBsZSBydW5zCisgICAgICAgIGFuZCBlYWNoIHJ1biBoYXMgZGlmZmVyZW50IHdyYXBw aW5nIHJ1bGVzCisgICAgICAgIGUuZy4gPG5vd3JhcD50aGlzX2NvbnRlbnRfZG9lc19ub3Rfd3Jh cDwvbm93cmFwPmJ1dF90aGlzX2RvZXMuCisKKyAgICAgICAgSW4gdGhpcyBwYXRjaCBwcm9jZXNz T3ZlcmZsb3dpbmdUZXh0Q29udGVudCByZXR1cm5zIHRoZSBvdmVyZmxvd2luZyBydW4gaW5kZXgg c28gdGhhdCBsYXRlcgorICAgICAgICB3ZSBjYW4gdXNlIHRoaXMgaW5mb3JtYXRpb24gdG8gZGVj aWRlIGlmIHRoaXMgb3ZlcmZsb3dpbmcgY29udGVudCBzaG91bGQgc3RheSBvciBnZXQgd3JhcHBl ZCB0byB0aGUgbmV4dCBsaW5lLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lQ29udGVudEJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZs b3dpbmdUZXh0Q29udGVudCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lQ29udGVudEJyZWFrZXIuaDoKKwogMjAyMS0wMi0wMSAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gIkZpbmQgdGhlIHRyYWlsaW5n IGluZGV4IiBsb2dpYyByZXBlYXRlZCBpbiBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092 ZXJmbG93aW5nVGV4dENvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAppbmRleCBl ZTNlY2Q3OGQ0NGUwMjU0NzdhNWQwMDE0YjMzNGVlM2NhOTAyYzEyLi5iYWYyYTcyMmM1NWFlYzYx M2FkZmZhYWVmMTA3MmRkOGY4NDEyNzFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuY3Bw CkBAIC0xNTksMTAgKzE1OSwxOSBAQCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGlu ZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzSW5saW5lQ29udGVudChjb25zdCBDbwogICAgIHJldHVy biByZXN1bHQ7CiB9CiAKLXN0cnVjdCBUcmFpbGluZ1RleHRDb250ZW50IHsKLSAgICBPcHRpb25h bDxzaXplX3Q+IHJ1bkluZGV4OyAvLyBJbiBzb21lIGNhc2VzIHdoZW4gdGhlIGZpcnN0IHJ1biBp cyBicmVha2FibGUgYnV0IGl0IGRvZXMgbm90IGZpdCwgdGhlcmUncyBub3QgdHJhaWxpbmcgcnVu IGluZGV4LgotICAgIGJvb2wgaGFzT3ZlcmZsb3cgeyBmYWxzZSB9OyAvLyBUcmFpbGluZyBjb250 ZW50IG92ZXJmbG93cyB0aGUgYXZhaWxhYmxlIHNwYWNlLgotICAgIE9wdGlvbmFsPElubGluZUNv bnRlbnRCcmVha2VyOjpQYXJ0aWFsUnVuPiBwYXJ0aWFsUnVuOworc3RydWN0IE92ZXJmbG93aW5n VGV4dENvbnRlbnQgeworICAgIHNpemVfdCBydW5JbmRleCB7IDAgfTsgLy8gT3ZlcmZsb3dpbmcg cnVuIGluZGV4LiBUaGVyZSdzIGFsd2F5cyBhbiBvdmVyZmxvd2luZyBydW4uCisgICAgc3RydWN0 IEJyZWFraW5nUG9zaXRpb24geworICAgICAgICBzaXplX3QgcnVuSW5kZXggeyAwIH07CisgICAg ICAgIHN0cnVjdCBUcmFpbGluZ0NvbnRlbnQgeworICAgICAgICAgICAgLy8gVHJhaWxpbmcgY29u dGVudCBpcyBlaXRoZXIgdGhlIHJ1bidzIGxlZnQgc2lkZSAod2hlbiB3ZSBicmVhayB0aGUgcnVu IHNvbWV3aGVyZSBpbiB0aGUgbWlkZGxlKSBvciB0aGUgcHJldmlvdXMgcnVuLgorICAgICAgICAg ICAgLy8gU29tZXRpbWVzIHRoZSBicmVha2luZyBwb3NpdGlvbiBpcyBhdCB0aGUgdmVyeSBiZWdp bm5pbmcgb2YgdGhlIGZpcnN0IHJ1biwgc28gdGhlcmUncyBubyB0cmFpbGluZyBydW4gYXQgYWxs LgorICAgICAgICAgICAgYm9vbCBvdmVyZmxvd3MgeyBmYWxzZSB9OworICAgICAgICAgICAgT3B0 aW9uYWw8SW5saW5lQ29udGVudEJyZWFrZXI6OlBhcnRpYWxSdW4+IHBhcnRpYWxSdW4geyB9Owor ICAgICAgICB9OworICAgICAgICBPcHRpb25hbDxUcmFpbGluZ0NvbnRlbnQ+IHRyYWlsaW5nQ29u dGVudCB7IH07CisgICAgfTsKKyAgICBPcHRpb25hbDxCcmVha2luZ1Bvc2l0aW9uPiBicmVha2lu Z1Bvc2l0aW9uIHsgfTsgLy8gV2hlcmUgd2UgYWN0dWFsbHkgYnJlYWsgdGhpcyBvdmVyZmxvd2lu ZyBjb250ZW50LgogfTsKIAogSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250 ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudChjb25zdCBDb250aW51b3VzQ29u dGVudCYgb3ZlcmZsb3dDb250ZW50LCBjb25zdCBMaW5lU3RhdHVzJiBsaW5lU3RhdHVzKSBjb25z dApAQCAtMTk0LDI5ICsyMDMsNDEgQEAgSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxp bmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudChjb24KICAgICB9CiAK ICAgICBpZiAoaXNUZXh0Q29udGVudChjb250aW51b3VzQ29udGVudCkpIHsKLSAgICAgICAgaWYg KGF1dG8gdHJhaWxpbmdDb250ZW50ID0gcHJvY2Vzc092ZXJmbG93aW5nVGV4dENvbnRlbnQoY29u dGludW91c0NvbnRlbnQsIGxpbmVTdGF0dXMpKSB7Ci0gICAgICAgICAgICBpZiAodHJhaWxpbmdD b250ZW50LT5oYXNPdmVyZmxvdykgewotICAgICAgICAgICAgICAgIGlmICghdHJhaWxpbmdDb250 ZW50LT5ydW5JbmRleC5oYXNWYWx1ZSgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIC8vIFdlIHRy aWVkIHRvIGJyZWFrIHRoZSBjb250ZW50IGJ1dCB0aGUgYXZhaWxhYmxlIHNwYWNlIGNhbid0IGV2 ZW4gYWNjb21tb2RhdGUgdGhlIGZpcnN0IGNoYXJhY3Rlci4KLSAgICAgICAgICAgICAgICAgICAg Ly8gMS4gV3JhcCB0aGUgY29udGVudCBvdmVyIHRvIHRoZSBuZXh0IGxpbmUgd2hlbiB3ZSd2ZSBn b3QgY29udGVudCBvbiB0aGUgbGluZSBhbHJlYWR5LgotICAgICAgICAgICAgICAgICAgICAvLyAy LiBLZWVwIHRoZSBmaXJzdCBjaGFyYWN0ZXIgb24gdGhlIGVtcHR5IGxpbmUgKG9yIGtlZXAgdGhl IHdob2xlIHJ1biBpZiBpdCBoYXMgb25seSBvbmUgY2hhcmFjdGVyL2NvbXBsZXRlbHkgZW1wdHkp LgotICAgICAgICAgICAgICAgICAgICBpZiAobGluZVN0YXR1cy5oYXNDb250ZW50KQotICAgICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OldyYXAsIElzRW5kT2ZM aW5lOjpZZXMgfTsKLSAgICAgICAgICAgICAgICAgICAgYXV0byBsZWFkaW5nVGV4dFJ1bkluZGV4 ID0gKmZpcnN0VGV4dFJ1bkluZGV4KGNvbnRpbnVvdXNDb250ZW50KTsKLSAgICAgICAgICAgICAg ICAgICAgYXV0byYgaW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oY29u dGludW91c0NvbnRlbnQucnVucygpW2xlYWRpbmdUZXh0UnVuSW5kZXhdLmlubGluZUl0ZW0pOwot ICAgICAgICAgICAgICAgICAgICBpZiAoaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCkgPD0gMSkKLSAg ICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBSZXN1bHQgeyBSZXN1bHQ6OkFjdGlvbjo6S2Vl cCwgSXNFbmRPZkxpbmU6OlllcyB9OwotICAgICAgICAgICAgICAgICAgICBhdXRvIGZpcnN0Q2hh cmFjdGVyV2lkdGggPSBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGlubGluZVRleHRJ dGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyAxLCBsaW5lU3RhdHVzLmNvbnRl bnRMb2dpY2FsUmlnaHQpOwotICAgICAgICAgICAgICAgICAgICBhdXRvIGZpcnN0Q2hhcmFjdGVy UnVuID0gUGFydGlhbFJ1biB7IDEsIGZpcnN0Q2hhcmFjdGVyV2lkdGggfTsKLSAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OkJyZWFrLCBJc0VuZE9mTGluZTo6WWVz LCBSZXN1bHQ6OlBhcnRpYWxUcmFpbGluZ0NvbnRlbnQgeyBsZWFkaW5nVGV4dFJ1bkluZGV4LCBm aXJzdENoYXJhY3RlclJ1biB9IH07Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAg IC8vIFdlIG1hbmFnZWQgdG8gYnJlYWsgYSBydW4gd2l0aCBvdmVyZmxvdy4gU2hvdWxkIG5vdCBr ZWVwIHRoaXMgb24gdGhlIGxpbmUgdW5sZXNzIGl0J3MgdGhlIG9ubHkgY29udGVudC4KKyAgICAg ICAgYXV0byB0cnlCcmVha2luZ1RleHRDb250ZW50ID0gWyZdKCkgLT4gT3B0aW9uYWw8UmVzdWx0 PiB7CisgICAgICAgICAgICAvLyAxLiBUaGlzIHRleHQgY29udGVudCBpcyBub3QgYnJlYWthYmxl LgorICAgICAgICAgICAgLy8gMi4gVGhpcyBicmVha2FibGUgdGV4dCBjb250ZW50IGRvZXMgbm90 IGZpdCBhdCBhbGwuIE5vdCBldmVuIHRoZSBmaXJzdCBnbHlwaC4gVGhpcyBpcyBhIHZlcnkgc3Bl Y2lhbCBjYXNlLgorICAgICAgICAgICAgLy8gMy4gV2UgY2FuIGJyZWFrIHRoZSBjb250ZW50IGJ1 dCBpdCBzdGlsbCBvdmVyZmxvd3MuCisgICAgICAgICAgICAvLyA0LiBNYW5hZ2VkIHRvIGJyZWFr IHRoZSBjb250ZW50IGJlZm9yZSB0aGUgb3ZlcmZsb3cgcG9pbnQuCisgICAgICAgICAgICBhdXRv IG92ZXJmbG93aW5nQ29udGVudCA9IHByb2Nlc3NPdmVyZmxvd2luZ1RleHRDb250ZW50KGNvbnRp bnVvdXNDb250ZW50LCBsaW5lU3RhdHVzKTsKKyAgICAgICAgICAgIGlmICghb3ZlcmZsb3dpbmdD b250ZW50LmJyZWFraW5nUG9zaXRpb24pCisgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKKyAg ICAgICAgICAgIGF1dG8gdHJhaWxpbmdDb250ZW50ID0gb3ZlcmZsb3dpbmdDb250ZW50LmJyZWFr aW5nUG9zaXRpb24tPnRyYWlsaW5nQ29udGVudDsKKyAgICAgICAgICAgIGlmICghdHJhaWxpbmdD b250ZW50KSB7CisgICAgICAgICAgICAgICAgLy8gV2UgdHJpZWQgdG8gYnJlYWsgdGhlIGNvbnRl bnQgYnV0IHRoZSBhdmFpbGFibGUgc3BhY2UgY2FuJ3QgZXZlbiBhY2NvbW1vZGF0ZSB0aGUgZmly c3QgZ2x5cGguCisgICAgICAgICAgICAgICAgLy8gMS4gV3JhcCB0aGUgY29udGVudCBvdmVyIHRv IHRoZSBuZXh0IGxpbmUgd2hlbiB3ZSd2ZSBnb3QgY29udGVudCBvbiB0aGUgbGluZSBhbHJlYWR5 LgorICAgICAgICAgICAgICAgIC8vIDIuIEtlZXAgdGhlIGZpcnN0IGdseXBoIG9uIHRoZSBlbXB0 eSBsaW5lIChvciBrZWVwIHRoZSB3aG9sZSBydW4gaWYgaXQgaGFzIG9ubHkgb25lIGdseXBoL2Nv bXBsZXRlbHkgZW1wdHkpLgogICAgICAgICAgICAgICAgIGlmIChsaW5lU3RhdHVzLmhhc0NvbnRl bnQpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiB7IFJlc3VsdDo6QWN0aW9uOjpXcmFwLCBJ c0VuZE9mTGluZTo6WWVzIH07CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBSZXN1bHQgeyBS ZXN1bHQ6OkFjdGlvbjo6V3JhcCwgSXNFbmRPZkxpbmU6OlllcyB9OworICAgICAgICAgICAgICAg IGF1dG8gbGVhZGluZ1RleHRSdW5JbmRleCA9ICpmaXJzdFRleHRSdW5JbmRleChjb250aW51b3Vz Q29udGVudCk7CisgICAgICAgICAgICAgICAgYXV0byYgaW5saW5lVGV4dEl0ZW0gPSBkb3duY2Fz dDxJbmxpbmVUZXh0SXRlbT4oY29udGludW91c0NvbnRlbnQucnVucygpW2xlYWRpbmdUZXh0UnVu SW5kZXhdLmlubGluZUl0ZW0pOworICAgICAgICAgICAgICAgIGlmIChpbmxpbmVUZXh0SXRlbS5s ZW5ndGgoKSA8PSAxKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gUmVzdWx0IHsgUmVzdWx0 OjpBY3Rpb246OktlZXAsIElzRW5kT2ZMaW5lOjpZZXMgfTsKKyAgICAgICAgICAgICAgICBhdXRv IGZpcnN0Q2hhcmFjdGVyV2lkdGggPSBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGlu bGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyAxLCBsaW5lU3Rh dHVzLmNvbnRlbnRMb2dpY2FsUmlnaHQpOworICAgICAgICAgICAgICAgIGF1dG8gZmlyc3RDaGFy YWN0ZXJSdW4gPSBQYXJ0aWFsUnVuIHsgMSwgZmlyc3RDaGFyYWN0ZXJXaWR0aCB9OworICAgICAg ICAgICAgICAgIHJldHVybiBSZXN1bHQgeyBSZXN1bHQ6OkFjdGlvbjo6QnJlYWssIElzRW5kT2ZM aW5lOjpZZXMsIFJlc3VsdDo6UGFydGlhbFRyYWlsaW5nQ29udGVudCB7IGxlYWRpbmdUZXh0UnVu SW5kZXgsIGZpcnN0Q2hhcmFjdGVyUnVuIH0gfTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAg IGF1dG8gdHJhaWxpbmdQYXJ0aWFsQ29udGVudCA9IFJlc3VsdDo6UGFydGlhbFRyYWlsaW5nQ29u dGVudCB7ICp0cmFpbGluZ0NvbnRlbnQtPnJ1bkluZGV4LCB0cmFpbGluZ0NvbnRlbnQtPnBhcnRp YWxSdW4gfTsKLSAgICAgICAgICAgIHJldHVybiB7IFJlc3VsdDo6QWN0aW9uOjpCcmVhaywgSXNF bmRPZkxpbmU6OlllcywgdHJhaWxpbmdQYXJ0aWFsQ29udGVudCB9OyAgICAgICAgfQorICAgICAg ICAgICAgaWYgKHRyYWlsaW5nQ29udGVudC0+b3ZlcmZsb3dzICYmIGxpbmVTdGF0dXMuaGFzQ29u dGVudCkgeworICAgICAgICAgICAgICAgIC8vIFdlIG1hbmFnZWQgdG8gYnJlYWsgYSBydW4gd2l0 aCBvdmVyZmxvdyBidXQgdGhlIGxpbmUgYWxyZWFkeSBoYXMgY29udGVudC4gTGV0J3Mgd3JhcCBp dCB0byB0aGUgbmV4dCBsaW5lLgorICAgICAgICAgICAgICAgIHJldHVybiBSZXN1bHQgeyBSZXN1 bHQ6OkFjdGlvbjo6V3JhcCwgSXNFbmRPZkxpbmU6OlllcyB9OworICAgICAgICAgICAgfQorICAg ICAgICAgICAgLy8gRWl0aGVyIHdlIG1hbmFnZWQgdG8gYnJlYWsgd2l0aCBubyBvdmVyZmxvdyBv ciB0aGUgbGluZSBpcyBlbXB0eS4KKyAgICAgICAgICAgIGF1dG8gdHJhaWxpbmdQYXJ0aWFsQ29u dGVudCA9IFJlc3VsdDo6UGFydGlhbFRyYWlsaW5nQ29udGVudCB7IG92ZXJmbG93aW5nQ29udGVu dC5icmVha2luZ1Bvc2l0aW9uLT5ydW5JbmRleCwgdHJhaWxpbmdDb250ZW50LT5wYXJ0aWFsUnVu IH07CisgICAgICAgICAgICByZXR1cm4gUmVzdWx0IHsgUmVzdWx0OjpBY3Rpb246OkJyZWFrLCBJ c0VuZE9mTGluZTo6WWVzLCB0cmFpbGluZ1BhcnRpYWxDb250ZW50IH07CisgICAgICAgIH07Cisg ICAgICAgIGlmIChhdXRvIHJlc3VsdCA9IHRyeUJyZWFraW5nVGV4dENvbnRlbnQoKSkKKyAgICAg ICAgICAgIHJldHVybiAqcmVzdWx0OwogICAgIH0KKwogICAgIC8vIElmIHdlIGFyZSBub3QgYWxs b3dlZCB0byBicmVhayB0aGlzIG92ZXJmbG93aW5nIGNvbnRlbnQsIHdlIHN0aWxsIG5lZWQgdG8g ZGVjaWRlIHdoZXRoZXIga2VlcCBpdCBvciB3cmFwIGl0IHRvIHRoZSBuZXh0IGxpbmUuCiAgICAg aWYgKCFsaW5lU3RhdHVzLmhhc0NvbnRlbnQpIHsKICAgICAgICAgQVNTRVJUKCFtX2hhc1dyYXBP cHBvcnR1bml0eUF0UHJldmlvdXNQb3NpdGlvbik7CkBAIC0yNTYsNyArMjc3LDcgQEAgSW5saW5l Q29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJm bG93aW5nQ29udGVudChjb24KICAgICByZXR1cm4geyBSZXN1bHQ6OkFjdGlvbjo6S2VlcCwgSXNF bmRPZkxpbmU6Ok5vIH07CiB9CiAKLU9wdGlvbmFsPFRyYWlsaW5nVGV4dENvbnRlbnQ+IElubGlu ZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdUZXh0Q29udGVudChjb25zdCBDb250 aW51b3VzQ29udGVudCYgY29udGludW91c0NvbnRlbnQsIGNvbnN0IExpbmVTdGF0dXMmIGxpbmVT dGF0dXMpIGNvbnN0CitPdmVyZmxvd2luZ1RleHRDb250ZW50IElubGluZUNvbnRlbnRCcmVha2Vy Ojpwcm9jZXNzT3ZlcmZsb3dpbmdUZXh0Q29udGVudChjb25zdCBDb250aW51b3VzQ29udGVudCYg Y29udGludW91c0NvbnRlbnQsIGNvbnN0IExpbmVTdGF0dXMmIGxpbmVTdGF0dXMpIGNvbnN0CiB7 CiAgICAgYXV0byYgcnVucyA9IGNvbnRpbnVvdXNDb250ZW50LnJ1bnMoKTsKICAgICBBU1NFUlQo IXJ1bnMuaXNFbXB0eSgpKTsKQEAgLTMwMiwyNyArMzIzLDI3IEBAIE9wdGlvbmFsPFRyYWlsaW5n VGV4dENvbnRlbnQ+IElubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdUZXh0 Q29udGVuCiAgICAgLy8gV2UgaGF2ZSB0byBoYXZlIGFuIG92ZXJmbG93aW5nIHJ1bi4KICAgICBS RUxFQVNFX0FTU0VSVChvdmVyZmxvd2luZ1J1bkluZGV4IDwgcnVucy5zaXplKCkpOwogCi0gICAg YXV0byB0cnlCcmVha2luZ092ZXJmbG93aW5nUnVuID0gWyZdKCkgLT4gT3B0aW9uYWw8VHJhaWxp bmdUZXh0Q29udGVudD4geworICAgIGF1dG8gdHJ5QnJlYWtpbmdPdmVyZmxvd2luZ1J1biA9IFsm XSgpIC0+IE9wdGlvbmFsPE92ZXJmbG93aW5nVGV4dENvbnRlbnQ6OkJyZWFraW5nUG9zaXRpb24+ IHsKICAgICAgICAgYXV0byBvdmVyZmxvd2luZ1J1biA9IHJ1bnNbb3ZlcmZsb3dpbmdSdW5JbmRl eF07CiAgICAgICAgIGlmICghaXNCcmVha2FibGVSdW4ob3ZlcmZsb3dpbmdSdW4pKQogICAgICAg ICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgaWYgKGF1dG8gcGFydGlhbFJ1biA9IHRyeUJyZWFr aW5nVGV4dFJ1bihvdmVyZmxvd2luZ1J1biwgbGluZVN0YXR1cy5jb250ZW50TG9naWNhbFJpZ2h0 ICsgYWNjdW11bGF0ZWRDb250ZW50V2lkdGgsIHN0ZDo6bWF4KDAuMGYsIGxpbmVTdGF0dXMuYXZh aWxhYmxlV2lkdGggLSBhY2N1bXVsYXRlZENvbnRlbnRXaWR0aCkpKSB7CiAgICAgICAgICAgICBp ZiAocGFydGlhbFJ1bi0+bGVuZ3RoKQotICAgICAgICAgICAgICAgIHJldHVybiBUcmFpbGluZ1Rl eHRDb250ZW50IHsgb3ZlcmZsb3dpbmdSdW5JbmRleCwgZmFsc2UsIHBhcnRpYWxSdW4gfTsKKyAg ICAgICAgICAgICAgICByZXR1cm4gT3ZlcmZsb3dpbmdUZXh0Q29udGVudDo6QnJlYWtpbmdQb3Np dGlvbiB7IG92ZXJmbG93aW5nUnVuSW5kZXgsIE92ZXJmbG93aW5nVGV4dENvbnRlbnQ6OkJyZWFr aW5nUG9zaXRpb246OlRyYWlsaW5nQ29udGVudCB7IGZhbHNlLCBwYXJ0aWFsUnVuIH0gfTsKICAg ICAgICAgICAgIC8vIFdoZW4gdGhlIGJyZWFraW5nIHBvc2l0aW9uIGlzIGF0IHRoZSBiZWdpbm5p bmcgb2YgdGhlIHJ1biwgdGhlIHRyYWlsaW5nIHJ1biBpcyB0aGUgcHJldmlvdXMgb25lLgogICAg ICAgICAgICAgaWYgKGF1dG8gdHJhaWxpbmdSdW5JbmRleCA9IGZpbmRUcmFpbGluZ1J1bkluZGV4 KG92ZXJmbG93aW5nUnVuSW5kZXgpKQotICAgICAgICAgICAgICAgIHJldHVybiBUcmFpbGluZ1Rl eHRDb250ZW50IHsgKnRyYWlsaW5nUnVuSW5kZXgsIGZhbHNlLCB7IH0gfTsKKyAgICAgICAgICAg ICAgICByZXR1cm4gT3ZlcmZsb3dpbmdUZXh0Q29udGVudDo6QnJlYWtpbmdQb3NpdGlvbiB7ICp0 cmFpbGluZ1J1bkluZGV4LCBPdmVyZmxvd2luZ1RleHRDb250ZW50OjpCcmVha2luZ1Bvc2l0aW9u OjpUcmFpbGluZ0NvbnRlbnQgeyB9IH07CiAgICAgICAgICAgICAvLyBTb21ldGltZXMgd2UgY2Fu J3QgYWNjb21tb2RhdGUgZXZlbiB0aGUgdmVyeSBmaXJzdCBjaGFyYWN0ZXIuIAogICAgICAgICAg ICAgLy8gTm90ZSB0aGF0IHRoaXMgaXMgZGlmZmVyZW50IGZyb20gd2hlbiB0aGVyZSdzIG5vIGJy ZWFrYWJsZSBydW4gaW4gdGhpcyBzZXQuCi0gICAgICAgICAgICByZXR1cm4gVHJhaWxpbmdUZXh0 Q29udGVudCB7IHsgfSwgdHJ1ZSwgeyB9IH07CisgICAgICAgICAgICByZXR1cm4gT3ZlcmZsb3dp bmdUZXh0Q29udGVudDo6QnJlYWtpbmdQb3NpdGlvbiB7IH07CiAgICAgICAgIH0KICAgICAgICAg cmV0dXJuIHsgfTsKICAgICB9OwogICAgIC8vIENoZWNrIGlmIHdlIGFjdHVhbGx5IGJyZWFrIHRo aXMgcnVuLgotICAgIGlmIChhdXRvIHRyYWlsaW5nQ29udGVudCA9IHRyeUJyZWFraW5nT3ZlcmZs b3dpbmdSdW4oKSkKLSAgICAgICAgcmV0dXJuIHRyYWlsaW5nQ29udGVudDsKKyAgICBpZiAoYXV0 byBicmVha2luZ1Bvc2l0aW9uID0gdHJ5QnJlYWtpbmdPdmVyZmxvd2luZ1J1bigpKQorICAgICAg ICByZXR1cm4geyBvdmVyZmxvd2luZ1J1bkluZGV4LCBicmVha2luZ1Bvc2l0aW9uIH07CiAKLSAg ICBhdXRvIHRyeUJyZWFraW5nUHJldmlvdXNOb25PdmVyZmxvd2luZ1J1bnMgPSBbJl0oKSAtPiBP cHRpb25hbDxUcmFpbGluZ1RleHRDb250ZW50PiB7CisgICAgYXV0byB0cnlCcmVha2luZ1ByZXZp b3VzTm9uT3ZlcmZsb3dpbmdSdW5zID0gWyZdKCkgLT4gT3B0aW9uYWw8T3ZlcmZsb3dpbmdUZXh0 Q29udGVudDo6QnJlYWtpbmdQb3NpdGlvbj4gewogICAgICAgICBhdXRvIHByZXZpb3VzQ29udGVu dFdpZHRoID0gYWNjdW11bGF0ZWRDb250ZW50V2lkdGg7CiAgICAgICAgIGZvciAoYXV0byBpbmRl eCA9IG92ZXJmbG93aW5nUnVuSW5kZXg7IGluZGV4LS07KSB7CiAgICAgICAgICAgICBhdXRvJiBy dW4gPSBydW5zW2luZGV4XTsKQEAgLTMzMiwyMCArMzUzLDIwIEBAIE9wdGlvbmFsPFRyYWlsaW5n VGV4dENvbnRlbnQ+IElubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdUZXh0 Q29udGVuCiAgICAgICAgICAgICBBU1NFUlQocnVuLmlubGluZUl0ZW0uaXNUZXh0KCkpOwogICAg ICAgICAgICAgaWYgKGF1dG8gcGFydGlhbFJ1biA9IHRyeUJyZWFraW5nVGV4dFJ1bihydW4sIGxp bmVTdGF0dXMuY29udGVudExvZ2ljYWxSaWdodCArIHByZXZpb3VzQ29udGVudFdpZHRoLCB7IH0p KSB7CiAgICAgICAgICAgICAgICAgLy8gV2Uga25vdyB0aGlzIHJ1biBmaXRzLCBzbyBpZiBicmVh a2luZyBpcyBhbGxvd2VkIG9uIHRoZSBydW4sIGl0IHNob3VsZCByZXR1cm4gYSBub24tZW1wdHkg bGVmdC1zaWRlCi0gICAgICAgICAgICAgICAgLy8gc2luY2UgaXQncyBlaXRoZXIgYXQgaHlwZW4g cG9zaXRpb24gb3IgdGhlIGVudGlyZSBydW4gaXMgcmV0dXJuZWQuCisgICAgICAgICAgICAgICAg Ly8gc2luY2UgaXQncyBlaXRoZXIgYXQgaHlwaGVuIHBvc2l0aW9uIG9yIHRoZSBlbnRpcmUgcnVu IGlzIHJldHVybmVkLgogICAgICAgICAgICAgICAgIEFTU0VSVChwYXJ0aWFsUnVuLT5sZW5ndGgp OwogICAgICAgICAgICAgICAgIGF1dG8gcnVuSXNGdWxseUFjY29tbW9kYXRlZCA9IHBhcnRpYWxS dW4tPmxlbmd0aCA9PSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4ocnVuLmlubGluZUl0ZW0pLmxl bmd0aCgpOwotICAgICAgICAgICAgICAgIHJldHVybiBUcmFpbGluZ1RleHRDb250ZW50IHsgaW5k ZXgsIGZhbHNlLCBydW5Jc0Z1bGx5QWNjb21tb2RhdGVkID8gV1RGOjpudWxsb3B0IDogcGFydGlh bFJ1biB9OworICAgICAgICAgICAgICAgIHJldHVybiBPdmVyZmxvd2luZ1RleHRDb250ZW50OjpC cmVha2luZ1Bvc2l0aW9uIHsgaW5kZXgsIE92ZXJmbG93aW5nVGV4dENvbnRlbnQ6OkJyZWFraW5n UG9zaXRpb246OlRyYWlsaW5nQ29udGVudCB7IGZhbHNlLCBydW5Jc0Z1bGx5QWNjb21tb2RhdGVk ID8gV1RGOjpudWxsb3B0IDogcGFydGlhbFJ1biB9IH07CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9OwogICAgIC8vIFdlIGRpZCBub3QgbWFuYWdl IHRvIGJyZWFrIHRoZSBydW4gdGhhdCBhY3R1YWxseSBvdmVyZmxvd3MgdGhlIGxpbmUuCiAgICAg Ly8gTGV0J3MgdHJ5IHRvIGZpbmQgYSBwcmV2aW91cyBicmVha2luZyBwb3NpdGlvbiBzdGFydGlu ZyBmcm9tIHRoZSBvdmVyZmxvd2luZyBydW4uIEl0IHN1cmVseSBmaXRzLgotICAgIGlmIChhdXRv IHRyYWlsaW5nQ29udGVudCA9IHRyeUJyZWFraW5nUHJldmlvdXNOb25PdmVyZmxvd2luZ1J1bnMo KSkKLSAgICAgICAgcmV0dXJuIHRyYWlsaW5nQ29udGVudDsKKyAgICBpZiAoYXV0byBicmVha2lu Z1Bvc2l0aW9uID0gdHJ5QnJlYWtpbmdQcmV2aW91c05vbk92ZXJmbG93aW5nUnVucygpKQorICAg ICAgICByZXR1cm4geyBvdmVyZmxvd2luZ1J1bkluZGV4LCBicmVha2luZ1Bvc2l0aW9uIH07CiAK LSAgICBhdXRvIHRyeUJyZWFraW5nTmV4dE92ZXJmbG93aW5nUnVucyA9IFsmXSgpIC0+IE9wdGlv bmFsPFRyYWlsaW5nVGV4dENvbnRlbnQ+IHsKKyAgICBhdXRvIHRyeUJyZWFraW5nTmV4dE92ZXJm bG93aW5nUnVucyA9IFsmXSgpIC0+IE9wdGlvbmFsPE92ZXJmbG93aW5nVGV4dENvbnRlbnQ6OkJy ZWFraW5nUG9zaXRpb24+IHsKICAgICAgICAgYXV0byBuZXh0Q29udGVudFdpZHRoID0gYWNjdW11 bGF0ZWRDb250ZW50V2lkdGggKyBydW5zW292ZXJmbG93aW5nUnVuSW5kZXhdLmxvZ2ljYWxXaWR0 aDsKICAgICAgICAgZm9yIChhdXRvIGluZGV4ID0gb3ZlcmZsb3dpbmdSdW5JbmRleCArIDE7IGlu ZGV4IDwgcnVucy5zaXplKCk7ICsraW5kZXgpIHsKICAgICAgICAgICAgIGF1dG8mIHJ1biA9IHJ1 bnNbaW5kZXhdOwpAQCAtMzYxLDEyICszODIsMTIgQEAgT3B0aW9uYWw8VHJhaWxpbmdUZXh0Q29u dGVudD4gSW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ1RleHRDb250ZW4K ICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKHRyYWlsaW5nUnVuSW5kZXgpOwogICAgICAgICAg ICAgICAgICAgICAvLyBBdCB3b3JzdCB3ZSBhcmUgYmFjayB0byB0aGUgb3ZlcmZsb3dpbmcgcnVu LCBsaWtlIGluIHRoZSBleGFtcGxlIGFib3ZlLgogICAgICAgICAgICAgICAgICAgICBBU1NFUlQo KnRyYWlsaW5nUnVuSW5kZXggPj0gb3ZlcmZsb3dpbmdSdW5JbmRleCk7Ci0gICAgICAgICAgICAg ICAgICAgIHJldHVybiBUcmFpbGluZ1RleHRDb250ZW50IHsgKnRyYWlsaW5nUnVuSW5kZXgsIHRy dWUsIHsgfSB9OworICAgICAgICAgICAgICAgICAgICByZXR1cm4gT3ZlcmZsb3dpbmdUZXh0Q29u dGVudDo6QnJlYWtpbmdQb3NpdGlvbiB7ICp0cmFpbGluZ1J1bkluZGV4LCBPdmVyZmxvd2luZ1Rl eHRDb250ZW50OjpCcmVha2luZ1Bvc2l0aW9uOjpUcmFpbGluZ0NvbnRlbnQgeyB0cnVlIH0gfTsK ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYgKGF1dG8gcGFydGlhbFJ1biA9 IHRyeUJyZWFraW5nVGV4dFJ1bihydW4sIGxpbmVTdGF0dXMuY29udGVudExvZ2ljYWxSaWdodCAr IG5leHRDb250ZW50V2lkdGgsIHsgfSkpIHsKICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKHBh cnRpYWxSdW4tPmxlbmd0aCk7CiAgICAgICAgICAgICAgICAgICAgIC8vIFdlIG1hbmFnZWQgdG8g YnJlYWsgdGhpcyB0ZXh0IHJ1biBtaWQgY29udGVudC4gSXQgaGFzIHRvIGJlIGEgaHlwaGVuIGJy ZWFrLgotICAgICAgICAgICAgICAgICAgICByZXR1cm4gVHJhaWxpbmdUZXh0Q29udGVudCB7IGlu ZGV4LCB0cnVlLCBwYXJ0aWFsUnVuIH07CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBPdmVy Zmxvd2luZ1RleHRDb250ZW50OjpCcmVha2luZ1Bvc2l0aW9uIHsgaW5kZXgsIE92ZXJmbG93aW5n VGV4dENvbnRlbnQ6OkJyZWFraW5nUG9zaXRpb246OlRyYWlsaW5nQ29udGVudCB7IHRydWUsIHBh cnRpYWxSdW4gfSB9OwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAg ICAgIG5leHRDb250ZW50V2lkdGggKz0gcnVuLmxvZ2ljYWxXaWR0aDsKQEAgLTM3NiwxMSArMzk3 LDExIEBAIE9wdGlvbmFsPFRyYWlsaW5nVGV4dENvbnRlbnQ+IElubGluZUNvbnRlbnRCcmVha2Vy Ojpwcm9jZXNzT3ZlcmZsb3dpbmdUZXh0Q29udGVuCiAgICAgLy8gQXQgdGhpcyBwb2ludCB3ZSBr bm93IHRoYXQgdGhlcmUncyBubyBicmVha2FibGUgcnVuIGFsbCB0aGUgd2F5IHRvIHRoZSBvdmVy Zmxvd2luZyBydW4uCiAgICAgLy8gTm93IHdlIG5lZWQgdG8gY2hlY2sgaWYgYW55IHJ1biBhZnRl ciB0aGUgb3ZlcmZsb3dpbmcgY29udGVudCBjYW4gYnJlYWsuCiAgICAgLy8gZS5nLiA8c3Bhbj50 aGlzX2NvbnRlbnRfb3ZlcmZsb3dzX2J1dF9ub3RfYnJlYWthYmxlPHNwYW4+PHNwYW4gc3R5bGU9 IndvcmQtYnJlYWs6IGJyZWFrLWFsbCI+YnV0X3RoaXNfaXNfYnJlYWthYmxlPC9zcGFuPgotICAg IGlmIChhdXRvIHRyYWlsaW5nQ29udGVudCA9IHRyeUJyZWFraW5nTmV4dE92ZXJmbG93aW5nUnVu cygpKQotICAgICAgICByZXR1cm4gdHJhaWxpbmdDb250ZW50OworICAgIGlmIChhdXRvIGJyZWFr aW5nUG9zaXRpb24gPSB0cnlCcmVha2luZ05leHRPdmVyZmxvd2luZ1J1bnMoKSkKKyAgICAgICAg cmV0dXJuIHsgb3ZlcmZsb3dpbmdSdW5JbmRleCwgYnJlYWtpbmdQb3NpdGlvbiB9OwogCiAgICAg Ly8gR2l2ZSB1cCwgdGhlcmUncyBubyBicmVha2FibGUgcnVuIGluIGhlcmUuCi0gICAgcmV0dXJu IHsgfTsKKyAgICByZXR1cm4geyBvdmVyZmxvd2luZ1J1bkluZGV4IH07CiB9CiAKIElubGluZUNv bnRlbnRCcmVha2VyOjpXb3JkQnJlYWtSdWxlIElubGluZUNvbnRlbnRCcmVha2VyOjp3b3JkQnJl YWtCZWhhdmlvcihjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpIGNvbnN0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtl ci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVu dEJyZWFrZXIuaAppbmRleCBhY2QzMTZiYzE4NzFmM2MxZjhjNjYyMjliOTg2N2NiNTc5MGE3NDI1 Li41NDNhYzRmZTIzNjdjMmM0NGFiYWRmN2E1MTA3ZTRmOTM5ODM5NDZlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNv bnRlbnRCcmVha2VyLmgKQEAgLTM2LDcgKzM2LDcgQEAgY2xhc3MgUmVuZGVyU3R5bGU7CiBuYW1l c3BhY2UgTGF5b3V0IHsKIAogY2xhc3MgSW5saW5lSXRlbTsKLXN0cnVjdCBUcmFpbGluZ1RleHRD b250ZW50Oworc3RydWN0IE92ZXJmbG93aW5nVGV4dENvbnRlbnQ7CiAKIGNsYXNzIElubGluZUNv bnRlbnRCcmVha2VyIHsKIHB1YmxpYzoKQEAgLTExOCw3ICsxMTgsNyBAQCBwdWJsaWM6CiAKIHBy aXZhdGU6CiAgICAgUmVzdWx0IHByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQoY29uc3QgQ29udGlu dW91c0NvbnRlbnQmLCBjb25zdCBMaW5lU3RhdHVzJikgY29uc3Q7Ci0gICAgT3B0aW9uYWw8VHJh aWxpbmdUZXh0Q29udGVudD4gcHJvY2Vzc092ZXJmbG93aW5nVGV4dENvbnRlbnQoY29uc3QgQ29u dGludW91c0NvbnRlbnQmLCBjb25zdCBMaW5lU3RhdHVzJikgY29uc3Q7CisgICAgT3ZlcmZsb3dp bmdUZXh0Q29udGVudCBwcm9jZXNzT3ZlcmZsb3dpbmdUZXh0Q29udGVudChjb25zdCBDb250aW51 b3VzQ29udGVudCYsIGNvbnN0IExpbmVTdGF0dXMmKSBjb25zdDsKICAgICBPcHRpb25hbDxQYXJ0 aWFsUnVuPiB0cnlCcmVha2luZ1RleHRSdW4oY29uc3QgQ29udGludW91c0NvbnRlbnQ6OlJ1biYg b3ZlcmZsb3dSdW4sIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIE9wdGlvbmFsPElubGlu ZUxheW91dFVuaXQ+IGF2YWlsYWJsZVdpZHRoKSBjb25zdDsKIAogICAgIGVudW0gY2xhc3MgV29y ZEJyZWFrUnVsZSB7Cg==