130366 2014-03-17 15:33:48 -0700 [CSS Shapes] shape-outside: ellipse(50% 50% at) causes crash 2014-03-18 12:51:30 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 giles_joplin giles_joplin bjonesbe commit-queue esprehn+autocc glenn gyuyoung.kim kling macpherson menard oldest_to_newest 991424 0 226971 giles_joplin 2014-03-17 15:33:48 -0700 Created attachment 226971 Test case. An incomplete shape-outside ellipse property value causes a crash: shape-outside: ellipse(50% 50% at) 991695 1 227060 giles_joplin 2014-03-18 09:39:20 -0700 Created attachment 227060 Patch The BasicShape ellipse and circle functions now report a syntax error if the "at" keyword is not followed by a position. 991799 2 227060 kling 2014-03-18 12:43:51 -0700 Comment on attachment 227060 Patch r=me 991807 3 227060 commit-queue 2014-03-18 12:51:26 -0700 Comment on attachment 227060 Patch Clearing flags on attachment: 227060 Committed r165835: <http://trac.webkit.org/changeset/165835> 991808 4 commit-queue 2014-03-18 12:51:30 -0700 All reviewed patches have been landed. Closing bug. 226971 2014-03-17 15:33:48 -0700 2014-03-17 15:33:48 -0700 Test case. ellipse-outside-crash.html text/html 740 giles_joplin PCFET0NUWVBFIEhUTUw+CjxodG1sPgo8aGVhZD4KPG1ldGEgY2hhcnNldD0iVVRGLTgiPgo8c3R5 bGU+CiAgICAuc2hhcGUgewogICAgICB3aWR0aDogMjAwcHg7CiAgICAgIGhlaWdodDogMjAwcHg7 CiAgICAgIC13ZWJraXQtc2hhcGUtb3V0c2lkZTogZWxsaXBzZSg1MCUgNTAlIGF0KTsKICAgICAg ZmxvYXQ6IGxlZnQ7CiAgICB9CiAgICA8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5PgogICAgPGRpdiBj bGFzcz0ic2hhcGUgb3V0c2lkZSI+PC9kaXY+CiAgICA8cD4KICAgIExvcmVtIGlwc3VtIGRvbG9y IHNpdCBhbWV0LCBjb25zZWN0ZXR1ciBhZGlwaXNpY2luZyBlbGl0LCBzZWQgZG8gZWl1c21vZCB0 ZW1wb3IgaW5jaWRpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hIGFsaXF1YS4gVXQgZW5p bSBhZCBtaW5pbSB2ZW5pYW0sIHF1aXMgbm9zdHJ1ZCBleGVyY2l0YXRpb24gdWxsYW1jbyBsYWJv cmlzIG5pc2kgdXQgYWxpcXVpcCBleCBlYSBjb21tb2RvIGNvbnNlcXVhdC4gRHVpcyBhdXRlIGly dXJlIGRvbG9yIGluIHJlcHJlaGVuZGVyaXQgaW4gdm9sdXB0YXRlIHZlbGl0IGVzc2UgY2lsbHVt IGRvbG9yZSBldSBmdWdpYXQgbnVsbGEgcGFyaWF0dXIuIEV4Y2VwdGV1ciBzaW50IG9jY2FlY2F0 IGN1cGlkYXRhdCBub24gcHJvaWRlbnQsIHN1bnQgaW4gY3VscGEgcXVpIG9mZmljaWEgZGVzZXJ1 bnQgbW9sbGl0IGFuaW0gaWQgZXN0IGxhYm9ydW0uCiAgICA8L3A+CjwvYm9keT4KPC9odG1sPgo= 227060 2014-03-18 09:39:20 -0700 2014-03-18 12:51:25 -0700 Patch tmp.patch text/plain 9015 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmZDY4OGU3Li4yOGZjNDA1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDMt MTggIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIHNoYXBlLW91dHNpZGU6IGVsbGlwc2UoNTAlIDUwJSBhdCkgY2F1c2VzIGNyYXNoCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAzNjYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBpbnZhbGlk IHN5bnRheCB0ZXN0cyBmb3IgZWxsaXBzZSguLiBhdCksIGNpcmNsZSguLiBhdCkgdmFyaWF0aW9u cy4KKworICAgICAgICAqIGZhc3Qvc2hhcGVzL3BhcnNpbmcvcGFyc2luZy1zaGFwZS1pbnNpZGUt ZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3Qvc2hhcGVzL3BhcnNpbmcvcGFyc2luZy1zaGFw ZS1vdXRzaWRlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L3NoYXBlcy9wYXJzaW5nL3Bh cnNpbmctdGVzdC11dGlscy5qczoKKwogMjAxNC0wMy0xNyAgSmVyIE5vYmxlICA8amVyLm5vYmxl QGFwcGxlLmNvbT4KIAogICAgICAgICBMYXlvdXQgVGVzdCBtYXRobWwvd2JyLWluLW1yb290LWNy YXNoLmh0bWwgY3Jhc2hlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvcGFy c2luZy9wYXJzaW5nLXNoYXBlLWluc2lkZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0 L3NoYXBlcy9wYXJzaW5nL3BhcnNpbmctc2hhcGUtaW5zaWRlLWV4cGVjdGVkLnR4dAppbmRleCA2 MmRjNmQ5Li42NzkwZjg1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9wYXJz aW5nL3BhcnNpbmctc2hhcGUtaW5zaWRlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L3NoYXBlcy9wYXJzaW5nL3BhcnNpbmctc2hhcGUtaW5zaWRlLWV4cGVjdGVkLnR4dApAQCAt MjA3LDYgKzIwNywxMCBAQCBQQVNTIGdldENTU1RleHQoIi13ZWJraXQtc2hhcGUtaW5zaWRlIiwg ImNpcmNsZShhdCBjZW50ZXIgY2VudGVyIDEwcHgpIikgaXMgIiIKIFBBU1MgZ2V0Q29tcHV0ZWRT dHlsZVZhbHVlKCItd2Via2l0LXNoYXBlLWluc2lkZSIsICJjaXJjbGUoYXQgY2VudGVyIGNlbnRl ciAxMHB4KSIpIGlzICJub25lIgogUEFTUyBnZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLWluc2lk ZSIsICJjaXJjbGUoYXQgMTBweCAxMHB4IGNsb3Nlc3Qtc2lkZSkiKSBpcyAiIgogUEFTUyBnZXRD b21wdXRlZFN0eWxlVmFsdWUoIi13ZWJraXQtc2hhcGUtaW5zaWRlIiwgImNpcmNsZShhdCAxMHB4 IDEwcHggY2xvc2VzdC1zaWRlKSIpIGlzICJub25lIgorUEFTUyBnZXRDU1NUZXh0KCItd2Via2l0 LXNoYXBlLWluc2lkZSIsICJjaXJjbGUoMTBweCBhdCkiKSBpcyAiIgorUEFTUyBnZXRDb21wdXRl ZFN0eWxlVmFsdWUoIi13ZWJraXQtc2hhcGUtaW5zaWRlIiwgImNpcmNsZSgxMHB4IGF0KSIpIGlz ICJub25lIgorUEFTUyBnZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLWluc2lkZSIsICJjaXJjbGUo YXQpIikgaXMgIiIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZVZhbHVlKCItd2Via2l0LXNoYXBlLWlu c2lkZSIsICJjaXJjbGUoYXQpIikgaXMgIm5vbmUiCiBQQVNTIGdldENTU1RleHQoIi13ZWJraXQt c2hhcGUtaW5zaWRlIiwgImVsbGlwc2UoMTBweCAyMHB4IDMwcHgpIikgaXMgIiIKIFBBU1MgZ2V0 Q29tcHV0ZWRTdHlsZVZhbHVlKCItd2Via2l0LXNoYXBlLWluc2lkZSIsICJlbGxpcHNlKDEwcHgg MjBweCAzMHB4KSIpIGlzICJub25lIgogUEFTUyBnZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLWlu c2lkZSIsICJlbGxpcHNlKDEwcHggYXQgMTBweCAxMHB4IDEwcHgpIikgaXMgIiIKQEAgLTIyNSw2 ICsyMjksMTAgQEAgUEFTUyBnZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLWluc2lkZSIsICJlbGxp cHNlKGF0IDEwcHggMTBweCBhdCBjZW50ZXIpIikgaXMgIiIKIFBBU1MgZ2V0Q29tcHV0ZWRTdHls ZVZhbHVlKCItd2Via2l0LXNoYXBlLWluc2lkZSIsICJlbGxpcHNlKGF0IDEwcHggMTBweCBhdCBj ZW50ZXIpIikgaXMgIm5vbmUiCiBQQVNTIGdldENTU1RleHQoIi13ZWJraXQtc2hhcGUtaW5zaWRl IiwgImVsbGlwc2UoYXQgY2VudGVyIGNlbnRlciAxMHB4KSIpIGlzICIiCiBQQVNTIGdldENvbXB1 dGVkU3R5bGVWYWx1ZSgiLXdlYmtpdC1zaGFwZS1pbnNpZGUiLCAiZWxsaXBzZShhdCBjZW50ZXIg Y2VudGVyIDEwcHgpIikgaXMgIm5vbmUiCitQQVNTIGdldENTU1RleHQoIi13ZWJraXQtc2hhcGUt aW5zaWRlIiwgImVsbGlwc2UoMTBweCAyMHB4IGF0KSIpIGlzICIiCitQQVNTIGdldENvbXB1dGVk U3R5bGVWYWx1ZSgiLXdlYmtpdC1zaGFwZS1pbnNpZGUiLCAiZWxsaXBzZSgxMHB4IDIwcHggYXQp IikgaXMgIm5vbmUiCitQQVNTIGdldENTU1RleHQoIi13ZWJraXQtc2hhcGUtaW5zaWRlIiwgImVs bGlwc2UoYXQpIikgaXMgIiIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZVZhbHVlKCItd2Via2l0LXNo YXBlLWluc2lkZSIsICJlbGxpcHNlKGF0KSIpIGlzICJub25lIgogUEFTUyBnZXRDU1NUZXh0KCIt d2Via2l0LXNoYXBlLWluc2lkZSIsICJwb2x5Z29uKCkiKSBpcyAiIgogUEFTUyBnZXRDb21wdXRl ZFN0eWxlVmFsdWUoIi13ZWJraXQtc2hhcGUtaW5zaWRlIiwgInBvbHlnb24oKSIpIGlzICJub25l IgogUEFTUyBnZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLWluc2lkZSIsICJwb2x5Z29uKGV2ZW5v ZGQgMTBweCAyMHB4LCAzMHB4IDQwcHgsIDQwcHggNTBweCkiKSBpcyAiIgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvcGFyc2luZy9wYXJzaW5nLXNoYXBlLW91dHNpZGUtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvcGFyc2luZy9wYXJzaW5nLXNoYXBl LW91dHNpZGUtZXhwZWN0ZWQudHh0CmluZGV4IDRmYTI2YjYuLjUxMDg4N2IgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3BhcnNpbmcvcGFyc2luZy1zaGFwZS1vdXRzaWRlLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9wYXJzaW5nL3BhcnNpbmct c2hhcGUtb3V0c2lkZS1leHBlY3RlZC50eHQKQEAgLTIwNSw2ICsyMDUsMTAgQEAgUEFTUyBnZXRD U1NUZXh0KCItd2Via2l0LXNoYXBlLW91dHNpZGUiLCAiY2lyY2xlKGF0IGNlbnRlciBjZW50ZXIg MTBweCkiKSBpcyAiIgogUEFTUyBnZXRDb21wdXRlZFN0eWxlVmFsdWUoIi13ZWJraXQtc2hhcGUt b3V0c2lkZSIsICJjaXJjbGUoYXQgY2VudGVyIGNlbnRlciAxMHB4KSIpIGlzICJub25lIgogUEFT UyBnZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLW91dHNpZGUiLCAiY2lyY2xlKGF0IDEwcHggMTBw eCBjbG9zZXN0LXNpZGUpIikgaXMgIiIKIFBBU1MgZ2V0Q29tcHV0ZWRTdHlsZVZhbHVlKCItd2Vi a2l0LXNoYXBlLW91dHNpZGUiLCAiY2lyY2xlKGF0IDEwcHggMTBweCBjbG9zZXN0LXNpZGUpIikg aXMgIm5vbmUiCitQQVNTIGdldENTU1RleHQoIi13ZWJraXQtc2hhcGUtb3V0c2lkZSIsICJjaXJj bGUoMTBweCBhdCkiKSBpcyAiIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlVmFsdWUoIi13ZWJraXQt c2hhcGUtb3V0c2lkZSIsICJjaXJjbGUoMTBweCBhdCkiKSBpcyAibm9uZSIKK1BBU1MgZ2V0Q1NT VGV4dCgiLXdlYmtpdC1zaGFwZS1vdXRzaWRlIiwgImNpcmNsZShhdCkiKSBpcyAiIgorUEFTUyBn ZXRDb21wdXRlZFN0eWxlVmFsdWUoIi13ZWJraXQtc2hhcGUtb3V0c2lkZSIsICJjaXJjbGUoYXQp IikgaXMgIm5vbmUiCiBQQVNTIGdldENTU1RleHQoIi13ZWJraXQtc2hhcGUtb3V0c2lkZSIsICJl bGxpcHNlKDEwcHggMjBweCAzMHB4KSIpIGlzICIiCiBQQVNTIGdldENvbXB1dGVkU3R5bGVWYWx1 ZSgiLXdlYmtpdC1zaGFwZS1vdXRzaWRlIiwgImVsbGlwc2UoMTBweCAyMHB4IDMwcHgpIikgaXMg Im5vbmUiCiBQQVNTIGdldENTU1RleHQoIi13ZWJraXQtc2hhcGUtb3V0c2lkZSIsICJlbGxpcHNl KDEwcHggYXQgMTBweCAxMHB4IDEwcHgpIikgaXMgIiIKQEAgLTIyMyw2ICsyMjcsMTAgQEAgUEFT UyBnZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLW91dHNpZGUiLCAiZWxsaXBzZShhdCAxMHB4IDEw cHggYXQgY2VudGVyKSIpIGlzICIKIFBBU1MgZ2V0Q29tcHV0ZWRTdHlsZVZhbHVlKCItd2Via2l0 LXNoYXBlLW91dHNpZGUiLCAiZWxsaXBzZShhdCAxMHB4IDEwcHggYXQgY2VudGVyKSIpIGlzICJu b25lIgogUEFTUyBnZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLW91dHNpZGUiLCAiZWxsaXBzZShh dCBjZW50ZXIgY2VudGVyIDEwcHgpIikgaXMgIiIKIFBBU1MgZ2V0Q29tcHV0ZWRTdHlsZVZhbHVl KCItd2Via2l0LXNoYXBlLW91dHNpZGUiLCAiZWxsaXBzZShhdCBjZW50ZXIgY2VudGVyIDEwcHgp IikgaXMgIm5vbmUiCitQQVNTIGdldENTU1RleHQoIi13ZWJraXQtc2hhcGUtb3V0c2lkZSIsICJl bGxpcHNlKDEwcHggMjBweCBhdCkiKSBpcyAiIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlVmFsdWUo Ii13ZWJraXQtc2hhcGUtb3V0c2lkZSIsICJlbGxpcHNlKDEwcHggMjBweCBhdCkiKSBpcyAibm9u ZSIKK1BBU1MgZ2V0Q1NTVGV4dCgiLXdlYmtpdC1zaGFwZS1vdXRzaWRlIiwgImVsbGlwc2UoYXQp IikgaXMgIiIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZVZhbHVlKCItd2Via2l0LXNoYXBlLW91dHNp ZGUiLCAiZWxsaXBzZShhdCkiKSBpcyAibm9uZSIKIFBBU1MgZ2V0Q1NTVGV4dCgiLXdlYmtpdC1z aGFwZS1vdXRzaWRlIiwgInBvbHlnb24oKSIpIGlzICIiCiBQQVNTIGdldENvbXB1dGVkU3R5bGVW YWx1ZSgiLXdlYmtpdC1zaGFwZS1vdXRzaWRlIiwgInBvbHlnb24oKSIpIGlzICJub25lIgogUEFT UyBnZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLW91dHNpZGUiLCAicG9seWdvbihldmVub2RkIDEw cHggMjBweCwgMzBweCA0MHB4LCA0MHB4IDUwcHgpIikgaXMgIiIKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3Qvc2hhcGVzL3BhcnNpbmcvcGFyc2luZy10ZXN0LXV0aWxzLmpzIGIvTGF5b3V0 VGVzdHMvZmFzdC9zaGFwZXMvcGFyc2luZy9wYXJzaW5nLXRlc3QtdXRpbHMuanMKaW5kZXggMGVk ZTA4ZS4uNDQ5NGQyMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvcGFyc2lu Zy9wYXJzaW5nLXRlc3QtdXRpbHMuanMKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvcGFy c2luZy9wYXJzaW5nLXRlc3QtdXRpbHMuanMKQEAgLTExOSw2ICsxMTksOCBAQCB2YXIgaW52YWxp ZFNoYXBlVmFsdWVzID0gWwogICAgICJjaXJjbGUoYXQgMTBweCAxMHB4IGF0IGNlbnRlcikiLAog ICAgICJjaXJjbGUoYXQgY2VudGVyIGNlbnRlciAxMHB4KSIsCiAgICAgImNpcmNsZShhdCAxMHB4 IDEwcHggY2xvc2VzdC1zaWRlKSIsCisgICAgImNpcmNsZSgxMHB4IGF0KSIsCisgICAgImNpcmNs ZShhdCkiLAogCiAgICAgImVsbGlwc2UoMTBweCAyMHB4IDMwcHgpIiwKICAgICAiZWxsaXBzZSgx MHB4IGF0IDEwcHggMTBweCAxMHB4KSIsCkBAIC0xMjksNiArMTMxLDggQEAgdmFyIGludmFsaWRT aGFwZVZhbHVlcyA9IFsKICAgICAiZWxsaXBzZShhdCAxMHB4IDEwcHggMTBweCkiLAogICAgICJl bGxpcHNlKGF0IDEwcHggMTBweCBhdCBjZW50ZXIpIiwKICAgICAiZWxsaXBzZShhdCBjZW50ZXIg Y2VudGVyIDEwcHgpIiwKKyAgICAiZWxsaXBzZSgxMHB4IDIwcHggYXQpIiwKKyAgICAiZWxsaXBz ZShhdCkiLAogCiAgICAgInBvbHlnb24oKSIsCiAgICAgInBvbHlnb24oZXZlbm9kZCAxMHB4IDIw cHgsIDMwcHggNDBweCwgNDBweCA1MHB4KSIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjM1MjIwZi4uMGI0Y2E5 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTAzLTE4ICBIYW5zIE11bGxlciAg PGhtdWxsZXJAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1MgU2hhcGVzXSBzaGFwZS1vdXRzaWRl OiBlbGxpcHNlKDUwJSA1MCUgYXQpIGNhdXNlcyBjcmFzaAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMzY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIEJhc2ljU2hhcGUgZWxsaXBzZSBhbmQgY2ly Y2xlIGZ1bmN0aW9ucyBub3cgcmVwb3J0IGEgc3ludGF4IGVycm9yCisgICAgICAgIGlmIHRoZSAi YXQiIGtleXdvcmQgaXMgbm90IGZvbGxvd2VkIGJ5IGEgcG9zaXRpb24uCisKKyAgICAgICAgVGhl IGV4aXN0aW5nIHBhcnNpbmcgdGVzdHMgaGF2ZSBiZWVuIHVwZGF0ZWQgdG8gaW5jbHVkZSB0aGlz IGNhc2UuCisKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNTU1BhcnNlcjo6cGFyc2VCYXNpY1NoYXBlQ2lyY2xlKToKKyAgICAgICAgKFdlYkNvcmU6OkNT U1BhcnNlcjo6cGFyc2VCYXNpY1NoYXBlRWxsaXBzZSk6CisKIDIwMTQtMDMtMTcgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYlZUVF0gRXh0ZW5kaW5n IFdlYlZUVCBSZW5kZXJpbmcgd2l0aCBSZWdpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCmlu ZGV4IGU2NmM3YzkuLmQ4ZDBlMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ YXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCkBAIC01NDgx LDcgKzU0ODEsNyBAQCBQYXNzUmVmUHRyPENTU0Jhc2ljU2hhcGU+IENTU1BhcnNlcjo6cGFyc2VC YXNpY1NoYXBlQ2lyY2xlKENTU1BhcnNlclZhbHVlTGlzdCogYQogICAgIEFTU0VSVChhcmdzKTsK IAogICAgIC8vIGNpcmNsZShyYWRpdXMpCi0gICAgLy8gY2lyY2xlKHJhZGl1cyBhdCA8cG9zaXRp b24+CisgICAgLy8gY2lyY2xlKHJhZGl1cyBhdCA8cG9zaXRpb24+KQogICAgIC8vIGNpcmNsZShh dCA8cG9zaXRpb24+KQogICAgIC8vIHdoZXJlIHBvc2l0aW9uIGRlZmluZXMgY2VudGVyWCBhbmQg Y2VudGVyWSB1c2luZyBhIENTUyA8cG9zaXRpb24+IGRhdGEgdHlwZS4KICAgICBSZWZQdHI8Q1NT QmFzaWNTaGFwZUNpcmNsZT4gc2hhcGUgPSBDU1NCYXNpY1NoYXBlQ2lyY2xlOjpjcmVhdGUoKTsK QEAgLTU1MDIsMTAgKzU1MDIsOSBAQCBQYXNzUmVmUHRyPENTU0Jhc2ljU2hhcGU+IENTU1BhcnNl cjo6cGFyc2VCYXNpY1NoYXBlQ2lyY2xlKENTU1BhcnNlclZhbHVlTGlzdCogYQogICAgICAgICAg ICAgcmV0dXJuIDA7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoYXJndW1lbnQtPmlkID09IENT U1ZhbHVlQXQpIHsKKyAgICAgICAgaWYgKGFyZ3VtZW50LT5pZCA9PSBDU1NWYWx1ZUF0ICYmIGFy Z3MtPm5leHQoKSkgewogICAgICAgICAgICAgUmVmUHRyPENTU1ZhbHVlPiBjZW50ZXJYOwogICAg ICAgICAgICAgUmVmUHRyPENTU1ZhbHVlPiBjZW50ZXJZOwotICAgICAgICAgICAgYXJncy0+bmV4 dCgpOyAvLyBzZXQgbGlzdCB0byBzdGFydCBvZiBwb3NpdGlvbiBjZW50ZXIKICAgICAgICAgICAg IHBhcnNlRmlsbFBvc2l0aW9uKGFyZ3MsIGNlbnRlclgsIGNlbnRlclkpOwogICAgICAgICAgICAg aWYgKGNlbnRlclggJiYgY2VudGVyWSAmJiAhYXJncy0+Y3VycmVudCgpKSB7CiAgICAgICAgICAg ICAgICAgQVNTRVJUKGNlbnRlclgtPmlzUHJpbWl0aXZlVmFsdWUoKSk7CkBAIC01NTI2LDkgKzU1 MjUsOSBAQCBQYXNzUmVmUHRyPENTU0Jhc2ljU2hhcGU+IENTU1BhcnNlcjo6cGFyc2VCYXNpY1No YXBlRWxsaXBzZShDU1NQYXJzZXJWYWx1ZUxpc3QqCiAgICAgQVNTRVJUKGFyZ3MpOwogCiAgICAg Ly8gZWxsaXBzZShyYWRpdXNYKQotICAgIC8vIGVsbGlwc2UocmFkaXVzWCBhdCA8cG9zaXRpb24+ CisgICAgLy8gZWxsaXBzZShyYWRpdXNYIGF0IDxwb3NpdGlvbj4pCiAgICAgLy8gZWxsaXBzZShy YWRpdXNYIHJhZGl1c1kpCi0gICAgLy8gZWxsaXBzZShyYWRpdXNYIHJhZGl1c1kgYXQgPHBvc2l0 aW9uPgorICAgIC8vIGVsbGlwc2UocmFkaXVzWCByYWRpdXNZIGF0IDxwb3NpdGlvbj4pCiAgICAg Ly8gZWxsaXBzZShhdCA8cG9zaXRpb24+KQogICAgIC8vIHdoZXJlIHBvc2l0aW9uIGRlZmluZXMg Y2VudGVyWCBhbmQgY2VudGVyWSB1c2luZyBhIENTUyA8cG9zaXRpb24+IGRhdGEgdHlwZS4KICAg ICBSZWZQdHI8Q1NTQmFzaWNTaGFwZUVsbGlwc2U+IHNoYXBlID0gQ1NTQmFzaWNTaGFwZUVsbGlw c2U6OmNyZWF0ZSgpOwpAQCAtNTU1MiwxMSArNTU1MSwxMSBAQCBQYXNzUmVmUHRyPENTU0Jhc2lj U2hhcGU+IENTU1BhcnNlcjo6cGFyc2VCYXNpY1NoYXBlRWxsaXBzZShDU1NQYXJzZXJWYWx1ZUxp c3QqCiAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChhcmd1 bWVudC0+aWQgIT0gQ1NTVmFsdWVBdCkKKyAgICAgICAgaWYgKGFyZ3VtZW50LT5pZCAhPSBDU1NW YWx1ZUF0IHx8ICFhcmdzLT5uZXh0KCkpIC8vIGV4cGVjdGluZyBlbGxpcHNlKC4uIGF0IDxwb3Np dGlvbj4pCiAgICAgICAgICAgICByZXR1cm4gMDsKKwogICAgICAgICBSZWZQdHI8Q1NTVmFsdWU+ IGNlbnRlclg7CiAgICAgICAgIFJlZlB0cjxDU1NWYWx1ZT4gY2VudGVyWTsKLSAgICAgICAgYXJn cy0+bmV4dCgpOyAvLyBzZXQgbGlzdCB0byBzdGFydCBvZiBwb3NpdGlvbiBjZW50ZXIKICAgICAg ICAgcGFyc2VGaWxsUG9zaXRpb24oYXJncywgY2VudGVyWCwgY2VudGVyWSk7CiAgICAgICAgIGlm ICghY2VudGVyWCB8fCAhY2VudGVyWSB8fCBhcmdzLT5jdXJyZW50KCkpCiAgICAgICAgICAgICBy ZXR1cm4gMDsK