213052 2020-06-10 15:10:45 -0700 [Line clamp] Do not apply the special anchor handling when the anchor content is visible after clamping 2020-06-11 11:09:02 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok darin ddkilzer esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser zalan oldest_to_newest 1661385 0 zalan 2020-06-10 15:10:45 -0700 <rdar://problem/59739131> 1661396 1 401592 zalan 2020-06-10 15:34:02 -0700 Created attachment 401592 Patch 1661419 2 401592 darin 2020-06-10 16:16:14 -0700 Comment on attachment 401592 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401592&action=review > Source/WebCore/ChangeLog:9 > + Line clamping tries to preserve the anchor text if it is at the bottom of the paragraph to support cases like "... Read mode", where the "read more" is an actual link. mode/more? 1661479 3 401615 zalan 2020-06-10 19:25:25 -0700 Created attachment 401615 Patch 1661481 4 ews-feeder 2020-06-10 20:01:54 -0700 Committed r262892: <https://trac.webkit.org/changeset/262892> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401615. 1661645 5 401615 ddkilzer 2020-06-11 11:01:42 -0700 Comment on attachment 401615 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401615&action=review > Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:1004 > - if (anchorBox && anchorBox->renderer().style().isLink()) > + auto& anchorRenderer = anchorBox->renderer(); > + auto& lastVisibleRenderer = lastVisibleLine->firstChild()->renderer(); > + if (anchorBox && anchorBox->renderer().style().isLink() && &lastVisibleRenderer != &anchorRenderer) Is Line 1002 (auto& anchorRenderer = anchorBox->renderer();) susceptible to a nullptr crash since you're no longer checking `anchorBox` before dereferencing it? 1661649 6 zalan 2020-06-11 11:05:55 -0700 (In reply to David Kilzer (:ddkilzer) from comment #5) > Comment on attachment 401615 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=401615&action=review > > > Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:1004 > > - if (anchorBox && anchorBox->renderer().style().isLink()) > > + auto& anchorRenderer = anchorBox->renderer(); > > + auto& lastVisibleRenderer = lastVisibleLine->firstChild()->renderer(); > > + if (anchorBox && anchorBox->renderer().style().isLink() && &lastVisibleRenderer != &anchorRenderer) > > Is Line 1002 (auto& anchorRenderer = anchorBox->renderer();) susceptible to > a nullptr crash since you're no longer checking `anchorBox` before > dereferencing it? It should never really happen but I'll add a check. Thanks. 1661651 7 zalan 2020-06-11 11:09:02 -0700 (In reply to zalan from comment #6) > (In reply to David Kilzer (:ddkilzer) from comment #5) > > Comment on attachment 401615 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=401615&action=review > > > > > Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:1004 > > > - if (anchorBox && anchorBox->renderer().style().isLink()) > > > + auto& anchorRenderer = anchorBox->renderer(); > > > + auto& lastVisibleRenderer = lastVisibleLine->firstChild()->renderer(); > > > + if (anchorBox && anchorBox->renderer().style().isLink() && &lastVisibleRenderer != &anchorRenderer) > > > > Is Line 1002 (auto& anchorRenderer = anchorBox->renderer();) susceptible to > > a nullptr crash since you're no longer checking `anchorBox` before > > dereferencing it? > It should never really happen but I'll add a check. Thanks. The InlineBox interface should probably be changed to return references. 401592 2020-06-10 15:34:02 -0700 2020-06-10 19:25:23 -0700 Patch bug-213052-20200610153401.patch text/plain 5238 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2ZlZGU0ZDZmZjQ0YzM5 NDliMzY3NjBlNjIwMDEzMWJhNWUxN2RmNy4uYTQ4MmI2ZDVhYWI1NTVmYTM0YmU5NWY0Zjk3MGQx ZTBkYWE1M2Y2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA2LTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xpbmUgY2xhbXBdIERvIG5v dCBhcHBseSB0aGUgc3BlY2lhbCBhbmNob3IgaGFuZGxpbmcgd2hlbiB0aGUgYW5jaG9yIGNvbnRl bnQgaXMgdmlzaWJsZSBhZnRlciBjbGFtcGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMDUyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81OTcz OTEzMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBM aW5lIGNsYW1waW5nIHRyaWVzIHRvIHByZXNlcnZlIHRoZSBhbmNob3IgdGV4dCBpZiBpdCBpcyBh dCB0aGUgYm90dG9tIG9mIHRoZSBwYXJhZ3JhcGggdG8gc3VwcG9ydCBjYXNlcyBsaWtlICIuLi4g UmVhZCBtb2RlIiwgd2hlcmUgdGhlICJyZWFkIG1vcmUiIGlzIGFuIGFjdHVhbCBsaW5rLgorICAg ICAgICBUaGlzIHBhdGNoIG1ha2VzIHN1cmUgdGhhdCB3ZSBvbmx5IGFwcGx5IHRoZSBzcGVjaWFs IGNhc2UgaGFuZGxpbmcgaWYgdGhlIGFuY2hvciB0ZXh0IGdldCBjbGFtcGVkLgorCisgICAgICAg IFRlc3Q6IGZhc3QvZmxleGJveC9saW5lLWNsYW1wLXdpdGgtYW5jaG9yLWNvbnRlbnQtb25seS5o dG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YXBwbHlM aW5lQ2xhbXApOgorCiAyMDIwLTA2LTAxICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBp Z2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtZmxleGJveF0gYWxpZ24tY29udGVudCBzaG91bGQg YXBwbHkgZXZlbiB3aGVuIHRoZXJlJ3MganVzdCBhIHNpbmdsZSBsaW5lCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3Bw CmluZGV4IDk3MDNiZTQ0OWY2MjI5ZmJjMzYwMGYwNTJlMDg0ZGE2OTE0NmUzMDIuLjQyMmRjZTFm M2NjYTcyMTg1N2JkOTI2MzZhMGYxYjE5NzMxYjVkZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCkBAIC05 ODcsNyArOTg3LDcgQEAgdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFwcGx5TGlu ZUNsYW1wKEZsZXhCb3hJdGVyYXRvciYgaXRlcmF0b3IsIGJvb2wKICAgICAgICAgICAgIGNvbnRp bnVlOwogCiAgICAgICAgIFJvb3RJbmxpbmVCb3gqIGxhc3RWaXNpYmxlTGluZSA9IGJsb2NrQ2hp bGQubGluZUF0SW5kZXgobnVtVmlzaWJsZUxpbmVzIC0gMSk7Ci0gICAgICAgIGlmICghbGFzdFZp c2libGVMaW5lKQorICAgICAgICBpZiAoIWxhc3RWaXNpYmxlTGluZSB8fCAhbGFzdFZpc2libGVM aW5lLT5maXJzdENoaWxkKCkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBjb25z dCBVQ2hhciBlbGxpcHNpc0FuZFNwYWNlWzJdID0geyBob3Jpem9udGFsRWxsaXBzaXMsICcgJyB9 OwpAQCAtOTk5LDcgKzk5OSw5IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94Ojph cHBseUxpbmVDbGFtcChGbGV4Qm94SXRlcmF0b3ImIGl0ZXJhdG9yLCBib29sCiAgICAgICAgIC8v IEdldCBlbGxpcHNpcyB3aWR0aCwgYW5kIGlmIHRoZSBsYXN0IGNoaWxkIGlzIGFuIGFuY2hvciwg aXQgd2lsbCBnbyBhZnRlciB0aGUgZWxsaXBzaXMsIHNvIGFkZCBpbiBhIHNwYWNlIGFuZCB0aGUg YW5jaG9yIHdpZHRoIHRvbwogICAgICAgICBMYXlvdXRVbml0IHRvdGFsV2lkdGg7CiAgICAgICAg IElubGluZUJveCogYW5jaG9yQm94ID0gbGFzdExpbmUtPmxhc3RDaGlsZCgpOwotICAgICAgICBp ZiAoYW5jaG9yQm94ICYmIGFuY2hvckJveC0+cmVuZGVyZXIoKS5zdHlsZSgpLmlzTGluaygpKQor ICAgICAgICBhdXRvJiBhbmNob3JSZW5kZXJlciA9IGFuY2hvckJveC0+cmVuZGVyZXIoKTsKKyAg ICAgICAgYXV0byYgbGFzdFZpc2libGVSZW5kZXJlciA9IGxhc3RWaXNpYmxlTGluZS0+Zmlyc3RD aGlsZCgpLT5yZW5kZXJlcigpOworICAgICAgICBpZiAoYW5jaG9yQm94ICYmIGFuY2hvckJveC0+ cmVuZGVyZXIoKS5zdHlsZSgpLmlzTGluaygpICYmICZsYXN0VmlzaWJsZVJlbmRlcmVyICE9ICZh bmNob3JSZW5kZXJlcikKICAgICAgICAgICAgIHRvdGFsV2lkdGggPSBhbmNob3JCb3gtPmxvZ2lj YWxXaWR0aCgpICsgZm9udC53aWR0aChjb25zdHJ1Y3RUZXh0UnVuKGVsbGlwc2lzQW5kU3BhY2Us IDIsIHN0eWxlKCkpKTsKICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICBhbmNob3JCb3ggPSBu dWxscHRyOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IDBjNTFhNWI4ODE3MTQzZTE4YzEwOTYzMTM3NTE3ZGNiYzNlYWZlNGYu LjQ4YTBmZTM3YzI0YzVmOTBmNDM1ZTJmNGY2YjlhMTU2ODA3ZDY4ODUgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNCBAQAorMjAyMC0wNi0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisg ICAgICAgIFtMaW5lIGNsYW1wXSBEbyBub3QgYXBwbHkgdGhlIHNwZWNpYWwgYW5jaG9yIGhhbmRs aW5nIHdoZW4gdGhlIGFuY2hvciBjb250ZW50IGlzIHZpc2libGUgYWZ0ZXIgY2xhbXBpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzA1MgorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNTk3MzkxMzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2ZsZXhib3gvbGluZS1jbGFtcC13aXRoLWFu Y2hvci1jb250ZW50LW9ubHktZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9m bGV4Ym94L2xpbmUtY2xhbXAtd2l0aC1hbmNob3ItY29udGVudC1vbmx5Lmh0bWw6IEFkZGVkLgor CiAyMDIwLTA2LTAzICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgog CiAgICAgICAgIFtjc3MtZmxleGJveF0gYWxpZ24tY29udGVudCBzaG91bGQgYXBwbHkgZXZlbiB3 aGVuIHRoZXJlJ3MganVzdCBhIHNpbmdsZSBsaW5lCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2ZsZXhib3gvbGluZS1jbGFtcC13aXRoLWFuY2hvci1jb250ZW50LW9ubHktZXhwZWN0ZWQu aHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9saW5lLWNsYW1wLXdpdGgtYW5jaG9yLWNv bnRlbnQtb25seS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjljMWQxMjNmNTQ2YzI4ZmY0MDgy NjA3ZGQwOGFhM2RkODVmMzcxZmEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2ZsZXhib3gvbGluZS1jbGFtcC13aXRoLWFuY2hvci1jb250ZW50LW9ubHktZXhwZWN0ZWQuaHRt bApAQCAtMCwwICsxLDE1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KK2EgeworICAgIGZv bnQtc2l6ZTogMjBweDsKKyAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7CisgICAgY29sb3I6IGdy ZWVuOworfQorCitkaXYgeworICAgIGRpc3BsYXk6IC13ZWJraXQtYm94OworICAgIC13ZWJraXQt Ym94LW9yaWVudDogdmVydGljYWw7CisgICAgd2lkdGg6IDIwMHB4OworfQorPC9zdHlsZT48ZGl2 PjxhIGhyZWY9IiIgaWQ9Y2xhbXA+cGFzcyBpZiB0aGlzIHRleHQgY29udGVuPC9hPjxicj48YSBo cmVmPSIiPmlzIHZpc2libGU8L2E+PC9kaXY+CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvZmxleGJveC9saW5lLWNsYW1wLXdpdGgtYW5jaG9yLWNvbnRlbnQtb25seS5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2xpbmUtY2xhbXAtd2l0aC1hbmNob3ItY29udGVudC1vbmx5 Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uZjZlNmM2NTdiMjMyOWQzNDMxYWVlYzI5M2Q4OTZjYmVkMTRiNDc5 YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9saW5lLWNsYW1w LXdpdGgtYW5jaG9yLWNvbnRlbnQtb25seS5odG1sCkBAIC0wLDAgKzEsMjQgQEAKKzwhRE9DVFlQ RSBodG1sPgorPHN0eWxlPgorYSB7CisgICAgZm9udC1zaXplOiAyMHB4OworICAgIHRleHQtZGVj b3JhdGlvbjogbm9uZTsKKyAgICBjb2xvcjogZ3JlZW47Cit9CisKK2RpdiB7CisgICAgZGlzcGxh eTogLXdlYmtpdC1ib3g7CisgICAgLXdlYmtpdC1ib3gtb3JpZW50OiB2ZXJ0aWNhbDsKKyAgICAt d2Via2l0LWxpbmUtY2xhbXA6IDE7CisgICAgd2lkdGg6IDIwMHB4OworfQorPC9zdHlsZT48ZGl2 PjxhIGhyZWY9IiIgaWQ9Y2xhbXA+cGFzcyBpZiB0aGlzIHRleHQgY29udGVudCBpcyB2aXNpYmxl PC9hPjwvZGl2PgorPGRpdiBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZlOyB0b3A6IC0yMHB4OyBs ZWZ0OiAxNzlweDsgd2lkdGg6IDEwMHB4OyBoZWlnaHQ6IDEwMHB4OyBiYWNrZ3JvdW5kLWNvbG9y OiB3aGl0ZTsiPjwvZGl2PjxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVz dFJ1bm5lci53YWl0VW50aWxEb25lKCk7CitzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgIGNs YW1wLnN0eWxlLmNvbG9yID0gImdyZWVuIjsKKyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisg ICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworfSwgMCk7Cis8L3NjcmlwdD4K 401615 2020-06-10 19:25:25 -0700 2020-06-10 20:01:54 -0700 Patch bug-213052-20200610192525.patch text/plain 6047 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyODcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTU1OTk1Zjc1ZTE1N2Uy ZTNiM2ZjNzhlZDYzN2ExMzNmMDc1MGYxYy4uMTNmZjQ0NjNjOTliNDE0ZjA4YjM4OTYwMzU1MzY5 MjFkNGJlM2E4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA2LTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xpbmUgY2xhbXBdIERvIG5v dCBhcHBseSB0aGUgc3BlY2lhbCBhbmNob3IgaGFuZGxpbmcgd2hlbiB0aGUgYW5jaG9yIGNvbnRl bnQgaXMgdmlzaWJsZSBhZnRlciBjbGFtcGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMDUyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81OTcz OTEzMT4KKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgTGlu ZSBjbGFtcGluZyB0cmllcyB0byBwcmVzZXJ2ZSB0aGUgYW5jaG9yIHRleHQgaWYgaXQgaXMgYXQg dGhlIGJvdHRvbSBvZiB0aGUgcGFyYWdyYXBoIHRvIHN1cHBvcnQgY2FzZXMgbGlrZSAiLi4uIFJl YWQgbW9yZSIsIHdoZXJlIHRoZSAicmVhZCBtb3JlIiBpcyBhbiBhY3R1YWwgbGluay4KKyAgICAg ICAgVGhpcyBwYXRjaCBtYWtlcyBzdXJlIHRoYXQgd2Ugb25seSBhcHBseSB0aGUgc3BlY2lhbCBj YXNlIGhhbmRsaW5nIGlmIHRoZSBhbmNob3IgdGV4dCBnZXQgY2xhbXBlZC4KKworICAgICAgICBU ZXN0OiBmYXN0L2ZsZXhib3gvbGluZS1jbGFtcC13aXRoLWFuY2hvci1jb250ZW50LW9ubHkuaHRt bAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmFwcGx5TGlu ZUNsYW1wKToKKwogMjAyMC0wNi0xMCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNv bT4KIAogICAgICAgICBJbXByb3ZlIENTUCBjb21wbGlhbmNlIHVuZGVyIFBTT04KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3gu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJv eC5jcHAKaW5kZXggOTcwM2JlNDQ5ZjYyMjlmYmMzNjAwZjA1MmUwODRkYTY5MTQ2ZTMwMi4uNDIy ZGNlMWYzY2NhNzIxODU3YmQ5MjYzNmEwZjFiMTk3MzFiNWRmNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAK QEAgLTk4Nyw3ICs5ODcsNyBAQCB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YXBw bHlMaW5lQ2xhbXAoRmxleEJveEl0ZXJhdG9yJiBpdGVyYXRvciwgYm9vbAogICAgICAgICAgICAg Y29udGludWU7CiAKICAgICAgICAgUm9vdElubGluZUJveCogbGFzdFZpc2libGVMaW5lID0gYmxv Y2tDaGlsZC5saW5lQXRJbmRleChudW1WaXNpYmxlTGluZXMgLSAxKTsKLSAgICAgICAgaWYgKCFs YXN0VmlzaWJsZUxpbmUpCisgICAgICAgIGlmICghbGFzdFZpc2libGVMaW5lIHx8ICFsYXN0Vmlz aWJsZUxpbmUtPmZpcnN0Q2hpbGQoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAg IGNvbnN0IFVDaGFyIGVsbGlwc2lzQW5kU3BhY2VbMl0gPSB7IGhvcml6b250YWxFbGxpcHNpcywg JyAnIH07CkBAIC05OTksNyArOTk5LDkgQEAgdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3g6OmFwcGx5TGluZUNsYW1wKEZsZXhCb3hJdGVyYXRvciYgaXRlcmF0b3IsIGJvb2wKICAgICAg ICAgLy8gR2V0IGVsbGlwc2lzIHdpZHRoLCBhbmQgaWYgdGhlIGxhc3QgY2hpbGQgaXMgYW4gYW5j aG9yLCBpdCB3aWxsIGdvIGFmdGVyIHRoZSBlbGxpcHNpcywgc28gYWRkIGluIGEgc3BhY2UgYW5k IHRoZSBhbmNob3Igd2lkdGggdG9vCiAgICAgICAgIExheW91dFVuaXQgdG90YWxXaWR0aDsKICAg ICAgICAgSW5saW5lQm94KiBhbmNob3JCb3ggPSBsYXN0TGluZS0+bGFzdENoaWxkKCk7Ci0gICAg ICAgIGlmIChhbmNob3JCb3ggJiYgYW5jaG9yQm94LT5yZW5kZXJlcigpLnN0eWxlKCkuaXNMaW5r KCkpCisgICAgICAgIGF1dG8mIGFuY2hvclJlbmRlcmVyID0gYW5jaG9yQm94LT5yZW5kZXJlcigp OworICAgICAgICBhdXRvJiBsYXN0VmlzaWJsZVJlbmRlcmVyID0gbGFzdFZpc2libGVMaW5lLT5m aXJzdENoaWxkKCktPnJlbmRlcmVyKCk7CisgICAgICAgIGlmIChhbmNob3JCb3ggJiYgYW5jaG9y Qm94LT5yZW5kZXJlcigpLnN0eWxlKCkuaXNMaW5rKCkgJiYgJmxhc3RWaXNpYmxlUmVuZGVyZXIg IT0gJmFuY2hvclJlbmRlcmVyKQogICAgICAgICAgICAgdG90YWxXaWR0aCA9IGFuY2hvckJveC0+ bG9naWNhbFdpZHRoKCkgKyBmb250LndpZHRoKGNvbnN0cnVjdFRleHRSdW4oZWxsaXBzaXNBbmRT cGFjZSwgMiwgc3R5bGUoKSkpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIGFuY2hvckJv eCA9IG51bGxwdHI7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggMTJlNDIxZGMwYzk0MjM4Y2MwYmFkODNhMTk2NjYwYjAwOWJl MDg2ZS4uY2I2MjE1YjFlZmI5ZjY2YzljNGVmOGRhNzkwODgxYmFlMjRhMmFkMSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDIwLTA2LTEwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CisKKyAgICAgICAgW0xpbmUgY2xhbXBdIERvIG5vdCBhcHBseSB0aGUgc3BlY2lhbCBhbmNob3Ig aGFuZGxpbmcgd2hlbiB0aGUgYW5jaG9yIGNvbnRlbnQgaXMgdmlzaWJsZSBhZnRlciBjbGFtcGlu ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMDUy CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81OTczOTEzMT4KKworICAgICAgICBSZXZpZXdlZCBi eSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgKiBmYXN0L2ZsZXhib3gvbGluZS1jbGFtcC13aXRo LWFuY2hvci1jb250ZW50LW9ubHktZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFz dC9mbGV4Ym94L2xpbmUtY2xhbXAtd2l0aC1hbmNob3ItY29udGVudC1vbmx5Lmh0bWw6IEFkZGVk LgorCiAyMDIwLTA2LTEwICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAg ICAgICAgW0pTQ10gSlNDYWxsYmFja09iamVjdDo6ZGVsZXRlUHJvcGVydHkgc2hvdWxkIHJlZGly ZWN0IHRvIFBhcmVudDo6ZGVsZXRlUHJvcGVydHlCeUluZGV4IGlmIHByb3BlcnR5TmFtZSBpcyBp bmRleApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2xpbmUtY2xhbXAtd2l0 aC1hbmNob3ItY29udGVudC1vbmx5LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Zs ZXhib3gvbGluZS1jbGFtcC13aXRoLWFuY2hvci1jb250ZW50LW9ubHktZXhwZWN0ZWQuaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi45YzFkMTIzZjU0NmMyOGZmNDA4MjYwN2RkMDhhYTNkZDg1ZjM3MWZhCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2xpbmUtY2xhbXAtd2l0aC1h bmNob3ItY29udGVudC1vbmx5LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxNSBAQAorPCFET0NU WVBFIGh0bWw+Cis8c3R5bGU+CithIHsKKyAgICBmb250LXNpemU6IDIwcHg7CisgICAgdGV4dC1k ZWNvcmF0aW9uOiBub25lOworICAgIGNvbG9yOiBncmVlbjsKK30KKworZGl2IHsKKyAgICBkaXNw bGF5OiAtd2Via2l0LWJveDsKKyAgICAtd2Via2l0LWJveC1vcmllbnQ6IHZlcnRpY2FsOworICAg IHdpZHRoOiAyMDBweDsKK30KKzwvc3R5bGU+PGRpdj48YSBocmVmPSIiIGlkPWNsYW1wPnBhc3Mg aWYgdGhpcyB0ZXh0IGNvbnRlbjwvYT48YnI+PGEgaHJlZj0iIj5pcyB2aXNpYmxlPC9hPjwvZGl2 PgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvbGluZS1jbGFtcC13aXRo LWFuY2hvci1jb250ZW50LW9ubHkuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9saW5l LWNsYW1wLXdpdGgtYW5jaG9yLWNvbnRlbnQtb25seS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmY2ZTZjNjU3 YjIzMjlkMzQzMWFlZWMyOTNkODk2Y2JlZDE0YjQ3OWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2ZsZXhib3gvbGluZS1jbGFtcC13aXRoLWFuY2hvci1jb250ZW50LW9ubHku aHRtbApAQCAtMCwwICsxLDI0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KK2EgeworICAg IGZvbnQtc2l6ZTogMjBweDsKKyAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7CisgICAgY29sb3I6 IGdyZWVuOworfQorCitkaXYgeworICAgIGRpc3BsYXk6IC13ZWJraXQtYm94OworICAgIC13ZWJr aXQtYm94LW9yaWVudDogdmVydGljYWw7CisgICAgLXdlYmtpdC1saW5lLWNsYW1wOiAxOworICAg IHdpZHRoOiAyMDBweDsKK30KKzwvc3R5bGU+PGRpdj48YSBocmVmPSIiIGlkPWNsYW1wPnBhc3Mg aWYgdGhpcyB0ZXh0IGNvbnRlbnQgaXMgdmlzaWJsZTwvYT48L2Rpdj4KKzxkaXYgc3R5bGU9InBv c2l0aW9uOiByZWxhdGl2ZTsgdG9wOiAtMjBweDsgbGVmdDogMTc5cHg7IHdpZHRoOiAxMDBweDsg aGVpZ2h0OiAxMDBweDsgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7Ij48L2Rpdj48c2NyaXB0Pgor aWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOwor c2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgICBjbGFtcC5zdHlsZS5jb2xvciA9ICJncmVlbiI7 CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURv bmUoKTsKK30sIDApOworPC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS93aW4vVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhw ZWN0YXRpb25zCmluZGV4IDdjMTA3OTY1ZGQwYjA1OTdiMzFhMjRiYmE0MjdiYzYxY2Y2Njg4MGIu LjBmNDc5ODQxMThiNGMwNzA2YTZjNTIyNGUxM2ViYzAzNTc3OTljNTEgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCkBAIC0zNjA1LDYgKzM2MDUsNyBAQCBmYXN0 L2Nzcy1nZW5lcmF0ZWQtY29udGVudC9pbml0aWFsLWxldHRlci1wYWdpbmF0aW9uLXN1bmtlbi5o dG1sIFsgSW1hZ2VPbmx5RmFpbAogZmFzdC9jc3MvcGFpbnQtb3JkZXItc2hhZG93Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIGZhc3QvZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLWFk anVzdC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBmYXN0L2ZsZXhib3gvaW1hZ2UtcGVyY2Vu dC1tYXgtaGVpZ2h0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KK2Zhc3QvZmxleGJveC9saW5l LWNsYW1wLXdpdGgtYW5jaG9yLWNvbnRlbnQtb25seS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiBmYXN0L2Zvcm1zL2Jhc2VsaW5lLW9mLW51bWJlci1pbnB1dHMuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQogZmFzdC9pbWFnZXMvaW1hZ2Utc3Vic2FtcGxpbmcuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQogZmFzdC9tdWx0aWNvbC9mbGV4Ym94LXJvd3MuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQo=