210654 2020-04-17 07:59:15 -0700 [LFC][TFC] Resolve the minimum width for overlapping spanner columns 2020-04-17 10:02:17 -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 1642671 0 zalan 2020-04-17 07:59:15 -0700 <tr><td colspan=3>#a</td></tr> <tr><td colspan=2>#b</td><td>#c</td></tr> Available space distribution requires minimum width for all columns. In this case column 1 2 3 have all overlapping spans. They need extra attention. 1642677 1 396765 zalan 2020-04-17 08:16:51 -0700 Created attachment 396765 Patch 1642681 2 396766 zalan 2020-04-17 08:24:09 -0700 Created attachment 396766 Patch 1642717 3 ews-feeder 2020-04-17 10:01:36 -0700 Committed r260258: <https://trac.webkit.org/changeset/260258> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396766. 1642718 4 webkit-bug-importer 2020-04-17 10:02:17 -0700 <rdar://problem/61939651> 396765 2020-04-17 08:16:51 -0700 2020-04-17 08:21:15 -0700 Patch bug-210654-20200417081650.patch text/plain 10821 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTg2NjczZmVmMTM3Mjdk ZGUxZTViYWI5NGMxMGMwMGVjYmJmYWY2OC4uZTUwMTRhNjQyOWMxOTk2ODE0NTk0YTRjZTM3NTQw NzU3ZDhhNjAyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA0LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBSZXNvbHZl IHRoZSBtaW5pbXVtIHdpZHRoIGZvciBvdmVybGFwcGluZyBzcGFubmVyIGNvbHVtbnMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDY1NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBleHRyYSBob3Jp em9udGFsIHNwYWNlIGRpc3RyaWJ1dGlvbiBpcyBiYXNlZCBvbiB0aGUgY29sdW1ucycgbWluaW11 bSB3aWR0aHMuCisgICAgICAgIEluIGNhc2Ugb2YgY29sdW1uIHNwYW5uZXJzLCBmaXJzdCB3ZSBu ZWVkIHRvIGRpc3RyaWJ1dGUgdGhlIHNwYW5uZXIncyBtaW5pbXVtCisgICAgICAgIHdpZHRoIGFj cm9zcyB0aGUgY29sdW1ucyB1c2luZyB0aGUgbm9uLXNwYW5uaW5nIG1pbmltdW0gd2lkdGhzIGFz IHRoZSBkaXN0cmlidXRpb24gcmF0aW8uCisgICAgICAgIFdoZW4gdGhlcmUncyBubyBub24tc3Bh bm5pbmcgbWluaW11bSB3aWR0aCBmb3IgYSBjb2x1bW4gKGFsbCByb3dzIGhhdmUgY29sdW1uIHNw YW5uZXJzIGZvciB0YmlzIHBhcnRpY3VsYXIgY29sdW1uKQorICAgICAgICB0aGUgbWluaW11bSB3 aWR0aCBnZXRzIGRpc3RyaWJ1dGVkIGVxdWFsbHkgYWNyb3NzIHRoZSBzcGFubmVkIGNvbHVtbnMu IFRoaXMgZGlzdHJpYnV0aW9uIHN0YXJ0cyB3aXRoIHRoZSBzaG9ydGVzdCBjb2x1bW5zIHNwYW5z CisgICAgICAgIHNvIHRoYXQgd2UgY2FuIHVzZSB0aGVzZSByZXNvbHZlZCBjb2x1bW4gd2lkdGhz IHRvIGNvbXB1dGUgdGhlIHdpZGVyIG9uZXMuIAorCisgICAgICAgICogbGF5b3V0L3RhYmxlZm9y bWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUFuZERpc3RyaWJ1dGVFeHRyYUhv cml6b250YWxTcGFjZSk6CisKIDIwMjAtMDQtMTQgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxl LmNvbT4KIAogICAgICAgICBBZG9wdCBpbnRlcmZhY2UgQVZBdWRpb1JvdXRpbmdBcmJpdGVyIGZv ciBNYWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcv VGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVm b3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGY5YzgxODY2NjNlYmMy ZjBjMDJkMDJkZDU1ZDA2NDZjNTNmMzkxMTIuLjU4ODExOTgxZDNkNDUyMDg2Y2Q5YTg0MThmNDE5 MWQ2ZDkxOWM1ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1h dHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMzM2LDcg KzMzNiw3IEBAIHZvaWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUFuZERpc3RyaWJ1 dGVFeHRyYUhvcml6b250YWxTcGFjZShMYXlvdXRVbml0CiAgICAgICAgICAgICBmbG9hdCB2YWx1 ZSB7IDAgfTsKICAgICAgICAgICAgIGJvb2wgaXNGaXhlZCB7IGZhbHNlIH07CiAgICAgICAgIH07 Ci0gICAgICAgIFZlY3RvcjxDb2x1bW5NaW5pbXVtV2lkdGg+IGNvbHVtbk1pbmltdW1XaWR0aHMo Y29sdW1uTGlzdC5zaXplKCkpOworICAgICAgICBWZWN0b3I8T3B0aW9uYWw8Q29sdW1uTWluaW11 bVdpZHRoPj4gY29sdW1uTWluaW11bVdpZHRocyhjb2x1bW5MaXN0LnNpemUoKSk7CiAgICAgICAg IFZlY3RvcjxTbG90UG9zaXRpb24+IHNwYW5uaW5nQ2VsbFBvc2l0aW9uTGlzdDsKICAgICAgICAg Zm9yIChzaXplX3Qgcm93SW5kZXggPSAwOyByb3dJbmRleCA8IHJvd3Muc2l6ZSgpOyArK3Jvd0lu ZGV4KSB7CiAgICAgICAgICAgICBmb3IgKHNpemVfdCBjb2x1bW5JbmRleCA9IDA7IGNvbHVtbklu ZGV4IDwgY29sdW1ucy5zaXplKCk7ICsrY29sdW1uSW5kZXgpIHsKQEAgLTM0Nyw3ICszNDcsOSBA QCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFI b3Jpem9udGFsU3BhY2UoTGF5b3V0VW5pdAogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg ICAgICBpZiAoc2xvdC5pc0NvbHVtblNwYW5uZWQoKSkKICAgICAgICAgICAgICAgICAgICAgY29u dGludWU7Ci0gICAgICAgICAgICAgICAgY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0u dmFsdWUgPSBzdGQ6Om1heDxmbG9hdD4oY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0u dmFsdWUsIHNsb3Qud2lkdGhDb25zdHJhaW50cygpLm1pbmltdW0pOworICAgICAgICAgICAgICAg IGlmICghY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0pCisgICAgICAgICAgICAgICAg ICAgIGNvbHVtbk1pbmltdW1XaWR0aHNbY29sdW1uSW5kZXhdLmVtcGxhY2UoQ29sdW1uTWluaW11 bVdpZHRoIHsgfSk7CisgICAgICAgICAgICAgICAgY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5J bmRleF0tPnZhbHVlID0gc3RkOjptYXg8ZmxvYXQ+KGNvbHVtbk1pbmltdW1XaWR0aHNbY29sdW1u SW5kZXhdLT52YWx1ZSwgc2xvdC53aWR0aENvbnN0cmFpbnRzKCkubWluaW11bSk7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICAgICAgLy8gMi4gQWRqdXN0IHRoZSA8dGQ+IG1pbmltdW0g d2lkdGhzIHdpdGggZml4ZWQgY29sdW1uIHdpZHRocyAoPGNvbD4gdnMuIDx0ZD4pIGFuZCBhbHNv IG1hbmFnZSBhbGwtZml4ZWQtd2lkdGgtY29sdW1uIGNvbnRlbnQuCkBAIC0zNTcsNTIgKzM1OSw5 MSBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRlRXh0 cmFIb3Jpem9udGFsU3BhY2UoTGF5b3V0VW5pdAogICAgICAgICAgICAgaWYgKCFjb2x1bW4uaXNG aXhlZFdpZHRoKCkpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAvLyBU aGlzIGlzIHRoZSBjb2x1bW4gd2lkdGggYmFzZWQgb24gPGNvbCB3aWR0aD0iIj4gYW5kIG5vdCA8 dGQgc3R5bGU9IndpZHRoOiAiPi4KLSAgICAgICAgICAgIGF1dG8gY29sdW1uRml4ZWRXaWR0aCA9 IGNvbHVtbi5ib3goKSA/IGNvbHVtbi5ib3goKS0+Y29sdW1uV2lkdGgoKSA6IFdURjo6bnVsbG9w dDsgCi0gICAgICAgICAgICBjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbkluZGV4XS52YWx1ZSA9 IHN0ZDo6bWF4KGNvbHVtbk1pbmltdW1XaWR0aHNbY29sdW1uSW5kZXhdLnZhbHVlLCBjb2x1bW5G aXhlZFdpZHRoLnZhbHVlT3IoMCkudG9GbG9hdCgpKTsKKyAgICAgICAgICAgIGF1dG8gY29sdW1u Rml4ZWRXaWR0aCA9IGNvbHVtbi5ib3goKSA/IGNvbHVtbi5ib3goKS0+Y29sdW1uV2lkdGgoKSA6 IFdURjo6bnVsbG9wdDsKKyAgICAgICAgICAgIGlmICghY29sdW1uRml4ZWRXaWR0aCkKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIGlmICghY29sdW1uTWluaW11bVdpZHRo c1tjb2x1bW5JbmRleF0pCisgICAgICAgICAgICAgICAgY29sdW1uTWluaW11bVdpZHRoc1tjb2x1 bW5JbmRleF0uZW1wbGFjZShDb2x1bW5NaW5pbXVtV2lkdGggeyB9KTsKKyAgICAgICAgICAgIGNv bHVtbk1pbmltdW1XaWR0aHNbY29sdW1uSW5kZXhdLT52YWx1ZSA9IHN0ZDo6bWF4KGNvbHVtbk1p bmltdW1XaWR0aHNbY29sdW1uSW5kZXhdLT52YWx1ZSwgY29sdW1uRml4ZWRXaWR0aC52YWx1ZU9y KDApLnRvRmxvYXQoKSk7CiAgICAgICAgICAgICAvLyBGaXhlZCBjb2x1bW5zIGZsZXggd2hlbiB0 aGVyZSBhcmUgbm8gb3RoZXIgZmxleGluZyBjb2x1bW5zLgotICAgICAgICAgICAgY29sdW1uTWlu aW11bVdpZHRoc1tjb2x1bW5JbmRleF0uaXNGaXhlZCA9ICFoYXNGaXhlZENvbHVtbnNPbmx5Owor ICAgICAgICAgICAgY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0tPmlzRml4ZWQgPSAh aGFzRml4ZWRDb2x1bW5zT25seTsKICAgICAgICAgfQogCisgICAgICAgIC8vIFdlIG5lZWQgdGhl c2Ugc3Bhbm5pbmcgY2VsbHMgaW4gdGhlIG9yZGVyIG9mIHRoZSBudW1iZXIgb2YgY29sdW1ucyB0 aGV5IHNwYW4gc28gdGhhdAorICAgICAgICAvLyB3ZSBjYW4gcmVzb2x2ZSBvdmVybGFwcGluZyBz cGFucyBzdGFydGluZyB3aXRoIHRoZSBzaG9ydGVyIG9uZXMgZS5nLgorICAgICAgICAvLyA8dGQg Y29sc3Bhbj00PiNhPC90ZD48dGQ+I2I8L3RkPgorICAgICAgICAvLyA8dGQgY29sc3Bhbj0yPiNj PC90ZD48dGQgY29sc3Bhbj0zPiNkPC90ZD4KKyAgICAgICAgc3RkOjpzb3J0KHNwYW5uaW5nQ2Vs bFBvc2l0aW9uTGlzdC5iZWdpbigpLCBzcGFubmluZ0NlbGxQb3NpdGlvbkxpc3QuZW5kKCksIFsm XSAoYXV0byYgYSwgYXV0byYgYikgeworICAgICAgICAgICAgcmV0dXJuIGdyaWQuc2xvdChhKS0+ Y2VsbCgpLmNvbHVtblNwYW4oKSA8IGdyaWQuc2xvdChiKS0+Y2VsbCgpLmNvbHVtblNwYW4oKTsK KyAgICAgICAgfSk7CiAgICAgICAgIC8vIDMuIERpc3RyaWJ1dGUgdGhlIHNwYW5uaW5nIGNlbGxz JyBtaW1pbXVtIHdpZHRocyBhY3Jvc3MgdGhlIGNvbHVtbnMgdXNpbmcgdGhlIG5vbi1zcGFubmlu ZyBtaW5pbXVtIHdpZHRocy4KICAgICAgICAgLy8gZS5nLiBbIDEgXVsgNSBdWyAxIF0KICAgICAg ICAgLy8gICAgICBbICAgIDkgICBdWyAxIF0KICAgICAgICAgLy8gVGhlIG1pbmltdW0gd2lkdGhz IGFyZTogWyAyIF1bIDcgXVsgMSBdCiAgICAgICAgIGZvciAoYXV0byBzcGFubmluZ0NlbGxQb3Np dGlvbiA6IHNwYW5uaW5nQ2VsbFBvc2l0aW9uTGlzdCkgewogICAgICAgICAgICAgYXV0byYgc2xv dCA9ICpncmlkLnNsb3Qoc3Bhbm5pbmdDZWxsUG9zaXRpb24pOwotICAgICAgICAgICAgYXV0byYg Y2VsbCA9IHNsb3QuY2VsbCgpOwogICAgICAgICAgICAgQVNTRVJUKHNsb3QuaGFzQ29sdW1uU3Bh bigpKTsKLSAgICAgICAgICAgIGZsb2F0IGN1cnJlbnRTcGFubmluZ01pbmltdW1XaWR0aCA9IDA7 Ci0gICAgICAgICAgICAvLyAxLiBDb2xsZWN0IHRoZSBub24tc3BhbmluZyBtaW5pbXVtIHdpZHRo cy4KLSAgICAgICAgICAgIGZvciAoYXV0byBjb2x1bW5JbmRleCA9IGNlbGwuc3RhcnRDb2x1bW4o KTsgY29sdW1uSW5kZXggPCBjZWxsLmVuZENvbHVtbigpOyArK2NvbHVtbkluZGV4KQotICAgICAg ICAgICAgICAgIGN1cnJlbnRTcGFubmluZ01pbmltdW1XaWR0aCArPSBjb2x1bW5NaW5pbXVtV2lk dGhzW2NvbHVtbkluZGV4XS52YWx1ZTsKKyAgICAgICAgICAgIGF1dG8mIGNlbGwgPSBzbG90LmNl bGwoKTsKICAgICAgICAgICAgIGZsb2F0IHNwYW5uaW5nTWluaW11bVdpZHRoID0gc2xvdC53aWR0 aENvbnN0cmFpbnRzKCkubWluaW11bTsKLSAgICAgICAgICAgIGlmIChjdXJyZW50U3Bhbm5pbmdN aW5pbXVtV2lkdGggPj0gc3Bhbm5pbmdNaW5pbXVtV2lkdGgpIHsKLSAgICAgICAgICAgICAgICAv LyBUaGUgc3Bhbm5pbmcgY2VsbCBmaXRzIHRoZSBzcGFubmVkIGNvbHVtbnMganVzdCBmaW5lLiBO b3RoaW5nIHRvIGRpc3RyaWJ1dGUuCi0gICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAg ICAgICBpZiAoIWNvbHVtbk1pbmltdW1XaWR0aHNbY2VsbC5zdGFydENvbHVtbigpXSB8fCAhY29s dW1uTWluaW11bVdpZHRoc1tjZWxsLmVuZENvbHVtbigpIC0gMV0pIHsKKyAgICAgICAgICAgICAg ICAvLyA8dGQgY29sc3Bhbj00PiNhPC90ZD48dGQ+I2I8L3RkPgorICAgICAgICAgICAgICAgIC8v IDx0ZCBjb2xzcGFuPTI+I2M8L3RkPjx0ZCBjb2xzcGFuPTM+I2Q8L3RkPgorICAgICAgICAgICAg ICAgIC8vIFVucmVzb2x2ZWQgY29sdW1ucyBhcmU6IDEgMiAzIDQKKyAgICAgICAgICAgICAgICAv LyAxLiBUYWtlIGNvbHNwYW49MiAoc2hvcnRlc3Qgc3BhbikgYW5kIHJlc29sdmUgY29sdW1uIDEg YW5kIDIKKyAgICAgICAgICAgICAgICAvLyAyLiBUYWtlIGNvbHNwYW49MyBhbmQgcmVzb2x2ZSBj b2x1bW4gMyBhbmQgNCAoNSBpcyByZXNvbHZlZCBiZWNhdXNlIGl0IGFscmVhZHkgaGFzIGEgbm9u LXNwYW5uaW5nIGNlbGwpLgorICAgICAgICAgICAgICAgIC8vIDMuIGNvbHNwYW49NCBuZWVkcyBu byByZXNvbHZpbmcgYmVjYXVzZSBhbGwgdGhlIHNwYW5uZWQgY29sdW1ucyAoMSAyIDMgNCkgaGF2 ZSBhbHJlYWR5IGJlZW4gcmVzb2x2ZWQuCisgICAgICAgICAgICAgICAgYXV0byB1bnJlc29sdmVk Q29sdW1uTnVtYmVyID0gY2VsbC5jb2x1bW5TcGFuKCk7CisgICAgICAgICAgICAgICAgZm9yIChh dXRvIGNvbHVtbkluZGV4ID0gY2VsbC5zdGFydENvbHVtbigpOyBjb2x1bW5JbmRleCA8IGNlbGwu ZW5kQ29sdW1uKCk7ICsrY29sdW1uSW5kZXgpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFj b2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbkluZGV4XSkKKyAgICAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOworICAgICAgICAgICAgICAgICAgICBBU1NFUlQodW5yZXNvbHZlZENvbHVtbk51 bWJlcik7CisgICAgICAgICAgICAgICAgICAgIC0tdW5yZXNvbHZlZENvbHVtbk51bWJlcjsKKyAg ICAgICAgICAgICAgICAgICAgc3Bhbm5pbmdNaW5pbXVtV2lkdGggPSBzdGQ6Om1heCgwLjBmLCBz cGFubmluZ01pbmltdW1XaWR0aCAtIGNvbHVtbk1pbmltdW1XaWR0aHNbY29sdW1uSW5kZXhdLT52 YWx1ZSk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIEFTU0VSVCh1bnJlc29s dmVkQ29sdW1uTnVtYmVyKTsKKyAgICAgICAgICAgICAgICBmb3IgKGF1dG8gY29sdW1uSW5kZXgg PSBjZWxsLnN0YXJ0Q29sdW1uKCk7IGNvbHVtbkluZGV4IDwgY2VsbC5lbmRDb2x1bW4oKTsgKytj b2x1bW5JbmRleCkgeworICAgICAgICAgICAgICAgICAgICBpZiAoY29sdW1uTWluaW11bVdpZHRo c1tjb2x1bW5JbmRleF0pCisgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAg ICAgICAgICAgICAgICAgY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0uZW1wbGFjZShD b2x1bW5NaW5pbXVtV2lkdGggeyBzcGFubmluZ01pbmltdW1XaWR0aCAvIHVucmVzb2x2ZWRDb2x1 bW5OdW1iZXIsIGZhbHNlIH0pOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgICAgLy8gMS4gQ29sbGVjdCB0aGUgbm9uLXNwYW5pbmcgbWluaW11 bSB3aWR0aHMuCisgICAgICAgICAgICAgICAgZmxvYXQgY3VycmVudFNwYW5uaW5nTWluaW11bVdp ZHRoID0gMDsKKyAgICAgICAgICAgICAgICBmb3IgKGF1dG8gY29sdW1uSW5kZXggPSBjZWxsLnN0 YXJ0Q29sdW1uKCk7IGNvbHVtbkluZGV4IDwgY2VsbC5lbmRDb2x1bW4oKTsgKytjb2x1bW5JbmRl eCkKKyAgICAgICAgICAgICAgICAgICAgY3VycmVudFNwYW5uaW5nTWluaW11bVdpZHRoICs9IGNv bHVtbk1pbmltdW1XaWR0aHNbY29sdW1uSW5kZXhdLT52YWx1ZTsKKyAgICAgICAgICAgICAgICBp ZiAoY3VycmVudFNwYW5uaW5nTWluaW11bVdpZHRoID49IHNwYW5uaW5nTWluaW11bVdpZHRoKSB7 CisgICAgICAgICAgICAgICAgICAgIC8vIFRoZSBzcGFubmluZyBjZWxsIGZpdHMgdGhlIHNwYW5u ZWQgY29sdW1ucyBqdXN0IGZpbmUuIE5vdGhpbmcgdG8gZGlzdHJpYnV0ZS4KKyAgICAgICAgICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIC8v IDIuIERpc3RyaWJ1dGUgdGhlIGV4dHJhIG1pbmltdW0gd2lkdGggYW1vbmcgdGhlIHNwYW5uZWQg Y29sdW1ucyBiYXNlZCBvbiB0aGUgbWluaW11bSBjb2xtbiB3aWR0aC4KKyAgICAgICAgICAgICAg ICAvLyBlLmcuIHNwYW5uaW5nIG1pbWltdW0gd2lkdGg6IFsgICA5ICAgXS4gQ3VycmVudCBtaW5p bXVtIHdpZHRocyBmb3IgdGhlIHNwYW5uZWQgY29sdW1uczogWyAxIF0gWyAyIF0KKyAgICAgICAg ICAgICAgICAvLyBOZXcgbWluaW11bSB3aWR0aHM6IFsgMyBdIFsgNiBdLgorICAgICAgICAgICAg ICAgIGF1dG8gc3BhY2VUb0Rpc3RyaWJ1dGUgPSBzcGFubmluZ01pbmltdW1XaWR0aCAtIGN1cnJl bnRTcGFubmluZ01pbmltdW1XaWR0aDsKKyAgICAgICAgICAgICAgICBmb3IgKGF1dG8gY29sdW1u SW5kZXggPSBjZWxsLnN0YXJ0Q29sdW1uKCk7IGNvbHVtbkluZGV4IDwgY2VsbC5lbmRDb2x1bW4o KTsgKytjb2x1bW5JbmRleCkKKyAgICAgICAgICAgICAgICAgICAgY29sdW1uTWluaW11bVdpZHRo c1tjb2x1bW5JbmRleF0tPnZhbHVlICs9IHNwYWNlVG9EaXN0cmlidXRlIC8gY3VycmVudFNwYW5u aW5nTWluaW11bVdpZHRoICogY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0tPnZhbHVl OwogICAgICAgICAgICAgfQotICAgICAgICAgICAgLy8gMi4gRGlzdHJpYnV0ZSB0aGUgZXh0cmEg bWluaW11bSB3aWR0aCBhbW9uZyB0aGUgc3Bhbm5lZCBjb2x1bW5zIGJhc2VkIG9uIHRoZSBtaW5p bXVtIGNvbG1uIHdpZHRoLgotICAgICAgICAgICAgLy8gZS5nLiBzcGFubmluZyBtaW1pbXVtIHdp ZHRoOiBbICAgOSAgIF0uIEN1cnJlbnQgbWluaW11bSB3aWR0aHMgZm9yIHRoZSBzcGFubmVkIGNv bHVtbnM6IFsgMSBdIFsgMiBdCi0gICAgICAgICAgICAvLyBOZXcgbWluaW11bSB3aWR0aHM6IFsg MyBdIFsgNiBdLgotICAgICAgICAgICAgYXV0byBzcGFjZVRvRGlzdHJpYnV0ZSA9IHNwYW5uaW5n TWluaW11bVdpZHRoIC0gY3VycmVudFNwYW5uaW5nTWluaW11bVdpZHRoOwotICAgICAgICAgICAg Zm9yIChhdXRvIGNvbHVtbkluZGV4ID0gY2VsbC5zdGFydENvbHVtbigpOyBjb2x1bW5JbmRleCA8 IGNlbGwuZW5kQ29sdW1uKCk7ICsrY29sdW1uSW5kZXgpCi0gICAgICAgICAgICAgICAgY29sdW1u TWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0udmFsdWUgKz0gc3BhY2VUb0Rpc3RyaWJ1dGUgLyBj dXJyZW50U3Bhbm5pbmdNaW5pbXVtV2lkdGggKiBjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbklu ZGV4XS52YWx1ZTsKICAgICAgICAgfQogICAgICAgICAvLyAzLiBEaXN0cmlidXRlIHRoZSBleHRy YSBzcGFjZSB1c2luZyB0aGUgZmluYWwgbWluaW11bSB3aWR0aHMuCisjaWYgQVNTRVJUX0VOQUJM RUQKKyAgICAgICAgLy8gV2UgaGF2ZSB0byBoYXZlIGFsbCB0aGUgY29sdW1ucyByZXNvbHZlZCBh dCB0aGlzIHBvaW50IHdpdGggdmFsaWQgbWluaW11bSB3aWR0aHMuCisgICAgICAgIGZvciAoYXV0 byYgY29sdW1uTWluaW11bVdpZHRoIDogY29sdW1uTWluaW11bVdpZHRocykKKyAgICAgICAgICAg IEFTU0VSVChjb2x1bW5NaW5pbXVtV2lkdGgpOworI2VuZGlmCiAgICAgICAgIC8vIEZpeGVkIHdp ZHRoIGNvbHVtbnMgZG9uJ3QgcGFydGljaXBhdGUgaW4gYXZhaWxhYmxlIHNwYWNlIGRpc3RyaWJ1 dGlvbi4KICAgICAgICAgLy8gVW5sZXNzIHRoZXJlIGFyZSBubyBmbGV4aW5nIGNvbHVtbiBhdCBh bGwsIHRoZW4gdGhleSBzdGFydCBmbGV4aW5nIGFzIGlmIHRoZXkgd2VyZSBub3QgZml4ZWQgYXQg YWxsLgogICAgICAgICBmbG9hdCBhZGp1c3RhYmxlZEhvcml6b250YWxTcGFjZSA9IDA7CiAgICAg ICAgIGZvciAoYXV0byYgY29sdW1uTWluaW11bVdpZHRoIDogY29sdW1uTWluaW11bVdpZHRocykg ewotICAgICAgICAgICAgaWYgKGNvbHVtbk1pbmltdW1XaWR0aC5pc0ZpeGVkKQorICAgICAgICAg ICAgaWYgKGNvbHVtbk1pbmltdW1XaWR0aC0+aXNGaXhlZCkKICAgICAgICAgICAgICAgICBjb250 aW51ZTsKLSAgICAgICAgICAgIGFkanVzdGFibGVkSG9yaXpvbnRhbFNwYWNlICs9IGNvbHVtbk1p bmltdW1XaWR0aC52YWx1ZTsKKyAgICAgICAgICAgIGFkanVzdGFibGVkSG9yaXpvbnRhbFNwYWNl ICs9IGNvbHVtbk1pbmltdW1XaWR0aC0+dmFsdWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKCFh ZGp1c3RhYmxlZEhvcml6b250YWxTcGFjZSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg Ly8gRklYTUU6IEltcGxlbWVudCBvdmVyY29uc3RyYWluZWQgY29sdW1ucyB3aGVuIGZpeGVkIHdp ZHRoIGNvbnRlbnQgaXMgd2lkZXIgdGhhbiB0aGUgdGFibGUuCiAgICAgICAgIGZvciAoc2l6ZV90 IGNvbHVtbkluZGV4ID0gMDsgY29sdW1uSW5kZXggPCBjb2x1bW5zLnNpemUoKTsgKytjb2x1bW5J bmRleCkgewogICAgICAgICAgICAgYXV0byYgY29sdW1uID0gY29sdW1ucy5saXN0KClbY29sdW1u SW5kZXhdOwotICAgICAgICAgICAgYXV0byBtaW5pbXVtV2lkdGggPSBjb2x1bW5NaW5pbXVtV2lk dGhzW2NvbHVtbkluZGV4XS52YWx1ZTsKLSAgICAgICAgICAgIGlmIChjb2x1bW5NaW5pbXVtV2lk dGhzW2NvbHVtbkluZGV4XS5pc0ZpeGVkKSB7CisgICAgICAgICAgICBhdXRvIG1pbmltdW1XaWR0 aCA9IGNvbHVtbk1pbmltdW1XaWR0aHNbY29sdW1uSW5kZXhdLT52YWx1ZTsKKyAgICAgICAgICAg IGlmIChjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbkluZGV4XS0+aXNGaXhlZCkgewogICAgICAg ICAgICAgICAgIGNvbHVtbi5zZXRMb2dpY2FsV2lkdGgoTGF5b3V0VW5pdCB7IG1pbmltdW1XaWR0 aCB9KTsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0K 396766 2020-04-17 08:24:09 -0700 2020-04-17 10:01:37 -0700 Patch bug-210654-20200417082408.patch text/plain 10800 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTg2NjczZmVmMTM3Mjdk ZGUxZTViYWI5NGMxMGMwMGVjYmJmYWY2OC4uZTUwMTRhNjQyOWMxOTk2ODE0NTk0YTRjZTM3NTQw NzU3ZDhhNjAyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA0LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBSZXNvbHZl IHRoZSBtaW5pbXVtIHdpZHRoIGZvciBvdmVybGFwcGluZyBzcGFubmVyIGNvbHVtbnMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDY1NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBleHRyYSBob3Jp em9udGFsIHNwYWNlIGRpc3RyaWJ1dGlvbiBpcyBiYXNlZCBvbiB0aGUgY29sdW1ucycgbWluaW11 bSB3aWR0aHMuCisgICAgICAgIEluIGNhc2Ugb2YgY29sdW1uIHNwYW5uZXJzLCBmaXJzdCB3ZSBu ZWVkIHRvIGRpc3RyaWJ1dGUgdGhlIHNwYW5uZXIncyBtaW5pbXVtCisgICAgICAgIHdpZHRoIGFj cm9zcyB0aGUgY29sdW1ucyB1c2luZyB0aGUgbm9uLXNwYW5uaW5nIG1pbmltdW0gd2lkdGhzIGFz IHRoZSBkaXN0cmlidXRpb24gcmF0aW8uCisgICAgICAgIFdoZW4gdGhlcmUncyBubyBub24tc3Bh bm5pbmcgbWluaW11bSB3aWR0aCBmb3IgYSBjb2x1bW4gKGFsbCByb3dzIGhhdmUgY29sdW1uIHNw YW5uZXJzIGZvciB0YmlzIHBhcnRpY3VsYXIgY29sdW1uKQorICAgICAgICB0aGUgbWluaW11bSB3 aWR0aCBnZXRzIGRpc3RyaWJ1dGVkIGVxdWFsbHkgYWNyb3NzIHRoZSBzcGFubmVkIGNvbHVtbnMu IFRoaXMgZGlzdHJpYnV0aW9uIHN0YXJ0cyB3aXRoIHRoZSBzaG9ydGVzdCBjb2x1bW5zIHNwYW5z CisgICAgICAgIHNvIHRoYXQgd2UgY2FuIHVzZSB0aGVzZSByZXNvbHZlZCBjb2x1bW4gd2lkdGhz IHRvIGNvbXB1dGUgdGhlIHdpZGVyIG9uZXMuIAorCisgICAgICAgICogbGF5b3V0L3RhYmxlZm9y bWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUFuZERpc3RyaWJ1dGVFeHRyYUhv cml6b250YWxTcGFjZSk6CisKIDIwMjAtMDQtMTQgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxl LmNvbT4KIAogICAgICAgICBBZG9wdCBpbnRlcmZhY2UgQVZBdWRpb1JvdXRpbmdBcmJpdGVyIGZv ciBNYWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcv VGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVm b3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGY5YzgxODY2NjNlYmMy ZjBjMDJkMDJkZDU1ZDA2NDZjNTNmMzkxMTIuLjdjZDhjMzVhOTE3YjI3NWRlYjZlYmVlNzY0YWVh ZTM2NDJmOTc4MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1h dHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMzM2LDcg KzMzNiw3IEBAIHZvaWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUFuZERpc3RyaWJ1 dGVFeHRyYUhvcml6b250YWxTcGFjZShMYXlvdXRVbml0CiAgICAgICAgICAgICBmbG9hdCB2YWx1 ZSB7IDAgfTsKICAgICAgICAgICAgIGJvb2wgaXNGaXhlZCB7IGZhbHNlIH07CiAgICAgICAgIH07 Ci0gICAgICAgIFZlY3RvcjxDb2x1bW5NaW5pbXVtV2lkdGg+IGNvbHVtbk1pbmltdW1XaWR0aHMo Y29sdW1uTGlzdC5zaXplKCkpOworICAgICAgICBWZWN0b3I8T3B0aW9uYWw8Q29sdW1uTWluaW11 bVdpZHRoPj4gY29sdW1uTWluaW11bVdpZHRocyhjb2x1bW5MaXN0LnNpemUoKSk7CiAgICAgICAg IFZlY3RvcjxTbG90UG9zaXRpb24+IHNwYW5uaW5nQ2VsbFBvc2l0aW9uTGlzdDsKICAgICAgICAg Zm9yIChzaXplX3Qgcm93SW5kZXggPSAwOyByb3dJbmRleCA8IHJvd3Muc2l6ZSgpOyArK3Jvd0lu ZGV4KSB7CiAgICAgICAgICAgICBmb3IgKHNpemVfdCBjb2x1bW5JbmRleCA9IDA7IGNvbHVtbklu ZGV4IDwgY29sdW1ucy5zaXplKCk7ICsrY29sdW1uSW5kZXgpIHsKQEAgLTM0Nyw3ICszNDcsOSBA QCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFI b3Jpem9udGFsU3BhY2UoTGF5b3V0VW5pdAogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg ICAgICBpZiAoc2xvdC5pc0NvbHVtblNwYW5uZWQoKSkKICAgICAgICAgICAgICAgICAgICAgY29u dGludWU7Ci0gICAgICAgICAgICAgICAgY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0u dmFsdWUgPSBzdGQ6Om1heDxmbG9hdD4oY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0u dmFsdWUsIHNsb3Qud2lkdGhDb25zdHJhaW50cygpLm1pbmltdW0pOworICAgICAgICAgICAgICAg IGlmICghY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0pCisgICAgICAgICAgICAgICAg ICAgIGNvbHVtbk1pbmltdW1XaWR0aHNbY29sdW1uSW5kZXhdID0gQ29sdW1uTWluaW11bVdpZHRo IHsgfTsKKyAgICAgICAgICAgICAgICBjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbkluZGV4XS0+ dmFsdWUgPSBzdGQ6Om1heDxmbG9hdD4oY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0t PnZhbHVlLCBzbG90LndpZHRoQ29uc3RyYWludHMoKS5taW5pbXVtKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQogICAgICAgICAvLyAyLiBBZGp1c3QgdGhlIDx0ZD4gbWluaW11bSB3aWR0aHMg d2l0aCBmaXhlZCBjb2x1bW4gd2lkdGhzICg8Y29sPiB2cy4gPHRkPikgYW5kIGFsc28gbWFuYWdl IGFsbC1maXhlZC13aWR0aC1jb2x1bW4gY29udGVudC4KQEAgLTM1Nyw1MiArMzU5LDkxIEBAIHZv aWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUFuZERpc3RyaWJ1dGVFeHRyYUhvcml6 b250YWxTcGFjZShMYXlvdXRVbml0CiAgICAgICAgICAgICBpZiAoIWNvbHVtbi5pc0ZpeGVkV2lk dGgoKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIC8vIFRoaXMgaXMg dGhlIGNvbHVtbiB3aWR0aCBiYXNlZCBvbiA8Y29sIHdpZHRoPSIiPiBhbmQgbm90IDx0ZCBzdHls ZT0id2lkdGg6ICI+LgotICAgICAgICAgICAgYXV0byBjb2x1bW5GaXhlZFdpZHRoID0gY29sdW1u LmJveCgpID8gY29sdW1uLmJveCgpLT5jb2x1bW5XaWR0aCgpIDogV1RGOjpudWxsb3B0OyAKLSAg ICAgICAgICAgIGNvbHVtbk1pbmltdW1XaWR0aHNbY29sdW1uSW5kZXhdLnZhbHVlID0gc3RkOjpt YXgoY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0udmFsdWUsIGNvbHVtbkZpeGVkV2lk dGgudmFsdWVPcigwKS50b0Zsb2F0KCkpOworICAgICAgICAgICAgYXV0byBjb2x1bW5GaXhlZFdp ZHRoID0gY29sdW1uLmJveCgpID8gY29sdW1uLmJveCgpLT5jb2x1bW5XaWR0aCgpIDogV1RGOjpu dWxsb3B0OworICAgICAgICAgICAgaWYgKCFjb2x1bW5GaXhlZFdpZHRoKQorICAgICAgICAgICAg ICAgIGNvbnRpbnVlOworICAgICAgICAgICAgaWYgKCFjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVt bkluZGV4XSkKKyAgICAgICAgICAgICAgICBjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbkluZGV4 XSA9IENvbHVtbk1pbmltdW1XaWR0aCB7IH07CisgICAgICAgICAgICBjb2x1bW5NaW5pbXVtV2lk dGhzW2NvbHVtbkluZGV4XS0+dmFsdWUgPSBzdGQ6Om1heChjb2x1bW5NaW5pbXVtV2lkdGhzW2Nv bHVtbkluZGV4XS0+dmFsdWUsIGNvbHVtbkZpeGVkV2lkdGgudmFsdWVPcigwKS50b0Zsb2F0KCkp OwogICAgICAgICAgICAgLy8gRml4ZWQgY29sdW1ucyBmbGV4IHdoZW4gdGhlcmUgYXJlIG5vIG90 aGVyIGZsZXhpbmcgY29sdW1ucy4KLSAgICAgICAgICAgIGNvbHVtbk1pbmltdW1XaWR0aHNbY29s dW1uSW5kZXhdLmlzRml4ZWQgPSAhaGFzRml4ZWRDb2x1bW5zT25seTsKKyAgICAgICAgICAgIGNv bHVtbk1pbmltdW1XaWR0aHNbY29sdW1uSW5kZXhdLT5pc0ZpeGVkID0gIWhhc0ZpeGVkQ29sdW1u c09ubHk7CiAgICAgICAgIH0KIAorICAgICAgICAvLyBXZSBuZWVkIHRoZXNlIHNwYW5uaW5nIGNl bGxzIGluIHRoZSBvcmRlciBvZiB0aGUgbnVtYmVyIG9mIGNvbHVtbnMgdGhleSBzcGFuIHNvIHRo YXQKKyAgICAgICAgLy8gd2UgY2FuIHJlc29sdmUgb3ZlcmxhcHBpbmcgc3BhbnMgc3RhcnRpbmcg d2l0aCB0aGUgc2hvcnRlciBvbmVzIGUuZy4KKyAgICAgICAgLy8gPHRkIGNvbHNwYW49ND4jYTwv dGQ+PHRkPiNiPC90ZD4KKyAgICAgICAgLy8gPHRkIGNvbHNwYW49Mj4jYzwvdGQ+PHRkIGNvbHNw YW49Mz4jZDwvdGQ+CisgICAgICAgIHN0ZDo6c29ydChzcGFubmluZ0NlbGxQb3NpdGlvbkxpc3Qu YmVnaW4oKSwgc3Bhbm5pbmdDZWxsUG9zaXRpb25MaXN0LmVuZCgpLCBbJl0gKGF1dG8mIGEsIGF1 dG8mIGIpIHsKKyAgICAgICAgICAgIHJldHVybiBncmlkLnNsb3QoYSktPmNlbGwoKS5jb2x1bW5T cGFuKCkgPCBncmlkLnNsb3QoYiktPmNlbGwoKS5jb2x1bW5TcGFuKCk7CisgICAgICAgIH0pOwog ICAgICAgICAvLyAzLiBEaXN0cmlidXRlIHRoZSBzcGFubmluZyBjZWxscycgbWltaW11bSB3aWR0 aHMgYWNyb3NzIHRoZSBjb2x1bW5zIHVzaW5nIHRoZSBub24tc3Bhbm5pbmcgbWluaW11bSB3aWR0 aHMuCiAgICAgICAgIC8vIGUuZy4gWyAxIF1bIDUgXVsgMSBdCiAgICAgICAgIC8vICAgICAgWyAg ICA5ICAgXVsgMSBdCiAgICAgICAgIC8vIFRoZSBtaW5pbXVtIHdpZHRocyBhcmU6IFsgMiBdWyA3 IF1bIDEgXQogICAgICAgICBmb3IgKGF1dG8gc3Bhbm5pbmdDZWxsUG9zaXRpb24gOiBzcGFubmlu Z0NlbGxQb3NpdGlvbkxpc3QpIHsKICAgICAgICAgICAgIGF1dG8mIHNsb3QgPSAqZ3JpZC5zbG90 KHNwYW5uaW5nQ2VsbFBvc2l0aW9uKTsKLSAgICAgICAgICAgIGF1dG8mIGNlbGwgPSBzbG90LmNl bGwoKTsKICAgICAgICAgICAgIEFTU0VSVChzbG90Lmhhc0NvbHVtblNwYW4oKSk7Ci0gICAgICAg ICAgICBmbG9hdCBjdXJyZW50U3Bhbm5pbmdNaW5pbXVtV2lkdGggPSAwOwotICAgICAgICAgICAg Ly8gMS4gQ29sbGVjdCB0aGUgbm9uLXNwYW5pbmcgbWluaW11bSB3aWR0aHMuCi0gICAgICAgICAg ICBmb3IgKGF1dG8gY29sdW1uSW5kZXggPSBjZWxsLnN0YXJ0Q29sdW1uKCk7IGNvbHVtbkluZGV4 IDwgY2VsbC5lbmRDb2x1bW4oKTsgKytjb2x1bW5JbmRleCkKLSAgICAgICAgICAgICAgICBjdXJy ZW50U3Bhbm5pbmdNaW5pbXVtV2lkdGggKz0gY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRl eF0udmFsdWU7CisgICAgICAgICAgICBhdXRvJiBjZWxsID0gc2xvdC5jZWxsKCk7CiAgICAgICAg ICAgICBmbG9hdCBzcGFubmluZ01pbmltdW1XaWR0aCA9IHNsb3Qud2lkdGhDb25zdHJhaW50cygp Lm1pbmltdW07Ci0gICAgICAgICAgICBpZiAoY3VycmVudFNwYW5uaW5nTWluaW11bVdpZHRoID49 IHNwYW5uaW5nTWluaW11bVdpZHRoKSB7Ci0gICAgICAgICAgICAgICAgLy8gVGhlIHNwYW5uaW5n IGNlbGwgZml0cyB0aGUgc3Bhbm5lZCBjb2x1bW5zIGp1c3QgZmluZS4gTm90aGluZyB0byBkaXN0 cmlidXRlLgotICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgaWYgKCFjb2x1 bW5NaW5pbXVtV2lkdGhzW2NlbGwuc3RhcnRDb2x1bW4oKV0gfHwgIWNvbHVtbk1pbmltdW1XaWR0 aHNbY2VsbC5lbmRDb2x1bW4oKSAtIDFdKSB7CisgICAgICAgICAgICAgICAgLy8gPHRkIGNvbHNw YW49ND4jYTwvdGQ+PHRkPiNiPC90ZD4KKyAgICAgICAgICAgICAgICAvLyA8dGQgY29sc3Bhbj0y PiNjPC90ZD48dGQgY29sc3Bhbj0zPiNkPC90ZD4KKyAgICAgICAgICAgICAgICAvLyBVbnJlc29s dmVkIGNvbHVtbnMgYXJlOiAxIDIgMyA0CisgICAgICAgICAgICAgICAgLy8gMS4gVGFrZSBjb2xz cGFuPTIgKHNob3J0ZXN0IHNwYW4pIGFuZCByZXNvbHZlIGNvbHVtbiAxIGFuZCAyCisgICAgICAg ICAgICAgICAgLy8gMi4gVGFrZSBjb2xzcGFuPTMgYW5kIHJlc29sdmUgY29sdW1uIDMgYW5kIDQg KDUgaXMgcmVzb2x2ZWQgYmVjYXVzZSBpdCBhbHJlYWR5IGhhcyBhIG5vbi1zcGFubmluZyBjZWxs KS4KKyAgICAgICAgICAgICAgICAvLyAzLiBjb2xzcGFuPTQgbmVlZHMgbm8gcmVzb2x2aW5nIGJl Y2F1c2UgYWxsIHRoZSBzcGFubmVkIGNvbHVtbnMgKDEgMiAzIDQpIGhhdmUgYWxyZWFkeSBiZWVu IHJlc29sdmVkLgorICAgICAgICAgICAgICAgIGF1dG8gdW5yZXNvbHZlZENvbHVtbk51bWJlciA9 IGNlbGwuY29sdW1uU3BhbigpOworICAgICAgICAgICAgICAgIGZvciAoYXV0byBjb2x1bW5JbmRl eCA9IGNlbGwuc3RhcnRDb2x1bW4oKTsgY29sdW1uSW5kZXggPCBjZWxsLmVuZENvbHVtbigpOyAr K2NvbHVtbkluZGV4KSB7CisgICAgICAgICAgICAgICAgICAgIGlmICghY29sdW1uTWluaW11bVdp ZHRoc1tjb2x1bW5JbmRleF0pCisgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAg ICAgICAgICAgICAgICAgICAgQVNTRVJUKHVucmVzb2x2ZWRDb2x1bW5OdW1iZXIpOworICAgICAg ICAgICAgICAgICAgICAtLXVucmVzb2x2ZWRDb2x1bW5OdW1iZXI7CisgICAgICAgICAgICAgICAg ICAgIHNwYW5uaW5nTWluaW11bVdpZHRoID0gc3RkOjptYXgoMC4wZiwgc3Bhbm5pbmdNaW5pbXVt V2lkdGggLSBjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbkluZGV4XS0+dmFsdWUpOworICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBBU1NFUlQodW5yZXNvbHZlZENvbHVtbk51bWJl cik7CisgICAgICAgICAgICAgICAgZm9yIChhdXRvIGNvbHVtbkluZGV4ID0gY2VsbC5zdGFydENv bHVtbigpOyBjb2x1bW5JbmRleCA8IGNlbGwuZW5kQ29sdW1uKCk7ICsrY29sdW1uSW5kZXgpIHsK KyAgICAgICAgICAgICAgICAgICAgaWYgKGNvbHVtbk1pbmltdW1XaWR0aHNbY29sdW1uSW5kZXhd KQorICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgICAg IGNvbHVtbk1pbmltdW1XaWR0aHNbY29sdW1uSW5kZXhdID0gQ29sdW1uTWluaW11bVdpZHRoIHsg c3Bhbm5pbmdNaW5pbXVtV2lkdGggLyB1bnJlc29sdmVkQ29sdW1uTnVtYmVyLCBmYWxzZSB9Owor ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAg Ly8gMS4gQ29sbGVjdCB0aGUgbm9uLXNwYW5pbmcgbWluaW11bSB3aWR0aHMuCisgICAgICAgICAg ICAgICAgZmxvYXQgY3VycmVudFNwYW5uaW5nTWluaW11bVdpZHRoID0gMDsKKyAgICAgICAgICAg ICAgICBmb3IgKGF1dG8gY29sdW1uSW5kZXggPSBjZWxsLnN0YXJ0Q29sdW1uKCk7IGNvbHVtbklu ZGV4IDwgY2VsbC5lbmRDb2x1bW4oKTsgKytjb2x1bW5JbmRleCkKKyAgICAgICAgICAgICAgICAg ICAgY3VycmVudFNwYW5uaW5nTWluaW11bVdpZHRoICs9IGNvbHVtbk1pbmltdW1XaWR0aHNbY29s dW1uSW5kZXhdLT52YWx1ZTsKKyAgICAgICAgICAgICAgICBpZiAoY3VycmVudFNwYW5uaW5nTWlu aW11bVdpZHRoID49IHNwYW5uaW5nTWluaW11bVdpZHRoKSB7CisgICAgICAgICAgICAgICAgICAg IC8vIFRoZSBzcGFubmluZyBjZWxsIGZpdHMgdGhlIHNwYW5uZWQgY29sdW1ucyBqdXN0IGZpbmUu IE5vdGhpbmcgdG8gZGlzdHJpYnV0ZS4KKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIC8vIDIuIERpc3RyaWJ1dGUgdGhlIGV4 dHJhIG1pbmltdW0gd2lkdGggYW1vbmcgdGhlIHNwYW5uZWQgY29sdW1ucyBiYXNlZCBvbiB0aGUg bWluaW11bSBjb2xtbiB3aWR0aC4KKyAgICAgICAgICAgICAgICAvLyBlLmcuIHNwYW5uaW5nIG1p bWltdW0gd2lkdGg6IFsgICA5ICAgXS4gQ3VycmVudCBtaW5pbXVtIHdpZHRocyBmb3IgdGhlIHNw YW5uZWQgY29sdW1uczogWyAxIF0gWyAyIF0KKyAgICAgICAgICAgICAgICAvLyBOZXcgbWluaW11 bSB3aWR0aHM6IFsgMyBdIFsgNiBdLgorICAgICAgICAgICAgICAgIGF1dG8gc3BhY2VUb0Rpc3Ry aWJ1dGUgPSBzcGFubmluZ01pbmltdW1XaWR0aCAtIGN1cnJlbnRTcGFubmluZ01pbmltdW1XaWR0 aDsKKyAgICAgICAgICAgICAgICBmb3IgKGF1dG8gY29sdW1uSW5kZXggPSBjZWxsLnN0YXJ0Q29s dW1uKCk7IGNvbHVtbkluZGV4IDwgY2VsbC5lbmRDb2x1bW4oKTsgKytjb2x1bW5JbmRleCkKKyAg ICAgICAgICAgICAgICAgICAgY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0tPnZhbHVl ICs9IHNwYWNlVG9EaXN0cmlidXRlIC8gY3VycmVudFNwYW5uaW5nTWluaW11bVdpZHRoICogY29s dW1uTWluaW11bVdpZHRoc1tjb2x1bW5JbmRleF0tPnZhbHVlOwogICAgICAgICAgICAgfQotICAg ICAgICAgICAgLy8gMi4gRGlzdHJpYnV0ZSB0aGUgZXh0cmEgbWluaW11bSB3aWR0aCBhbW9uZyB0 aGUgc3Bhbm5lZCBjb2x1bW5zIGJhc2VkIG9uIHRoZSBtaW5pbXVtIGNvbG1uIHdpZHRoLgotICAg ICAgICAgICAgLy8gZS5nLiBzcGFubmluZyBtaW1pbXVtIHdpZHRoOiBbICAgOSAgIF0uIEN1cnJl bnQgbWluaW11bSB3aWR0aHMgZm9yIHRoZSBzcGFubmVkIGNvbHVtbnM6IFsgMSBdIFsgMiBdCi0g ICAgICAgICAgICAvLyBOZXcgbWluaW11bSB3aWR0aHM6IFsgMyBdIFsgNiBdLgotICAgICAgICAg ICAgYXV0byBzcGFjZVRvRGlzdHJpYnV0ZSA9IHNwYW5uaW5nTWluaW11bVdpZHRoIC0gY3VycmVu dFNwYW5uaW5nTWluaW11bVdpZHRoOwotICAgICAgICAgICAgZm9yIChhdXRvIGNvbHVtbkluZGV4 ID0gY2VsbC5zdGFydENvbHVtbigpOyBjb2x1bW5JbmRleCA8IGNlbGwuZW5kQ29sdW1uKCk7ICsr Y29sdW1uSW5kZXgpCi0gICAgICAgICAgICAgICAgY29sdW1uTWluaW11bVdpZHRoc1tjb2x1bW5J bmRleF0udmFsdWUgKz0gc3BhY2VUb0Rpc3RyaWJ1dGUgLyBjdXJyZW50U3Bhbm5pbmdNaW5pbXVt V2lkdGggKiBjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbkluZGV4XS52YWx1ZTsKICAgICAgICAg fQogICAgICAgICAvLyAzLiBEaXN0cmlidXRlIHRoZSBleHRyYSBzcGFjZSB1c2luZyB0aGUgZmlu YWwgbWluaW11bSB3aWR0aHMuCisjaWYgQVNTRVJUX0VOQUJMRUQKKyAgICAgICAgLy8gV2UgaGF2 ZSB0byBoYXZlIGFsbCB0aGUgY29sdW1ucyByZXNvbHZlZCBhdCB0aGlzIHBvaW50IHdpdGggdmFs aWQgbWluaW11bSB3aWR0aHMuCisgICAgICAgIGZvciAoYXV0byYgY29sdW1uTWluaW11bVdpZHRo IDogY29sdW1uTWluaW11bVdpZHRocykKKyAgICAgICAgICAgIEFTU0VSVChjb2x1bW5NaW5pbXVt V2lkdGgpOworI2VuZGlmCiAgICAgICAgIC8vIEZpeGVkIHdpZHRoIGNvbHVtbnMgZG9uJ3QgcGFy dGljaXBhdGUgaW4gYXZhaWxhYmxlIHNwYWNlIGRpc3RyaWJ1dGlvbi4KICAgICAgICAgLy8gVW5s ZXNzIHRoZXJlIGFyZSBubyBmbGV4aW5nIGNvbHVtbiBhdCBhbGwsIHRoZW4gdGhleSBzdGFydCBm bGV4aW5nIGFzIGlmIHRoZXkgd2VyZSBub3QgZml4ZWQgYXQgYWxsLgogICAgICAgICBmbG9hdCBh ZGp1c3RhYmxlZEhvcml6b250YWxTcGFjZSA9IDA7CiAgICAgICAgIGZvciAoYXV0byYgY29sdW1u TWluaW11bVdpZHRoIDogY29sdW1uTWluaW11bVdpZHRocykgewotICAgICAgICAgICAgaWYgKGNv bHVtbk1pbmltdW1XaWR0aC5pc0ZpeGVkKQorICAgICAgICAgICAgaWYgKGNvbHVtbk1pbmltdW1X aWR0aC0+aXNGaXhlZCkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGFk anVzdGFibGVkSG9yaXpvbnRhbFNwYWNlICs9IGNvbHVtbk1pbmltdW1XaWR0aC52YWx1ZTsKKyAg ICAgICAgICAgIGFkanVzdGFibGVkSG9yaXpvbnRhbFNwYWNlICs9IGNvbHVtbk1pbmltdW1XaWR0 aC0+dmFsdWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKCFhZGp1c3RhYmxlZEhvcml6b250YWxT cGFjZSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgLy8gRklYTUU6IEltcGxlbWVudCBv dmVyY29uc3RyYWluZWQgY29sdW1ucyB3aGVuIGZpeGVkIHdpZHRoIGNvbnRlbnQgaXMgd2lkZXIg dGhhbiB0aGUgdGFibGUuCiAgICAgICAgIGZvciAoc2l6ZV90IGNvbHVtbkluZGV4ID0gMDsgY29s dW1uSW5kZXggPCBjb2x1bW5zLnNpemUoKTsgKytjb2x1bW5JbmRleCkgewogICAgICAgICAgICAg YXV0byYgY29sdW1uID0gY29sdW1ucy5saXN0KClbY29sdW1uSW5kZXhdOwotICAgICAgICAgICAg YXV0byBtaW5pbXVtV2lkdGggPSBjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbkluZGV4XS52YWx1 ZTsKLSAgICAgICAgICAgIGlmIChjb2x1bW5NaW5pbXVtV2lkdGhzW2NvbHVtbkluZGV4XS5pc0Zp eGVkKSB7CisgICAgICAgICAgICBhdXRvIG1pbmltdW1XaWR0aCA9IGNvbHVtbk1pbmltdW1XaWR0 aHNbY29sdW1uSW5kZXhdLT52YWx1ZTsKKyAgICAgICAgICAgIGlmIChjb2x1bW5NaW5pbXVtV2lk dGhzW2NvbHVtbkluZGV4XS0+aXNGaXhlZCkgewogICAgICAgICAgICAgICAgIGNvbHVtbi5zZXRM b2dpY2FsV2lkdGgoTGF5b3V0VW5pdCB7IG1pbmltdW1XaWR0aCB9KTsKICAgICAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgICAgIH0K