165832 2016-12-13 17:32:17 -0800 [CSS Parser] Make CSSFunctionValue derive from CSSValueList 2016-12-13 19:25:24 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 1259596 0 hyatt 2016-12-13 17:32:17 -0800 [CSS Parser] Make CSSFunctionValue derive from CSSValueList 1259598 1 297053 hyatt 2016-12-13 17:34:32 -0800 Created attachment 297053 Patch 1259617 2 hyatt 2016-12-13 19:25:24 -0800 Fixed in r209788. 297053 2016-12-13 17:34:32 -0800 2016-12-13 17:46:45 -0800 Patch bug-165832-20161213193343.patch text/plain 13987 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTc4NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE2LTEyLTEzICBEYXZlIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgUGFyc2VyXSBNYWtlIENTU0Z1 bmN0aW9uVmFsdWUgZGVyaXZlIGZyb20gQ1NTVmFsdWVMaXN0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU4MzIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaXRoIHRoZSBvbGQgcGFyc2VyIGdvbmUsIHdl IGNhbiBub3cgc2hyaW5rIENTU0Z1bmN0aW9uVmFsdWUgYSBiaXQgYnkKKyAgICAgICAgaGF2aW5n IGl0IGRlcml2ZSBmcm9tIENTU1ZhbHVlTGlzdCBpbnN0ZWFkIG9mIGhhdmluZyBhbiBleHRyYSBt ZW1iZXIKKyAgICAgICAgdGhhdCBob2xkcyBhIHZhbHVlIGxpc3Qgb2YgYXJndW1lbnRzLiBUaGlz IGlzIHNpbWlsYXIgdG8gdGhlIHRyaWNrCisgICAgICAgIGFscmVhZHkgZW1wbG95ZWQgYnkgV2Vi a2l0Q1NTVHJhbnNmb3JtVmFsdWUuCisKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNwZWNpZmllZFZhbHVlRm9yR3JpZFRy YWNrU2l6ZSk6CisgICAgICAgICogY3NzL0NTU0Z1bmN0aW9uVmFsdWUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q1NTRnVuY3Rpb25WYWx1ZTo6Y3VzdG9tQ1NTVGV4dCk6CisgICAgICAgIChXZWJD b3JlOjpDU1NGdW5jdGlvblZhbHVlOjpDU1NGdW5jdGlvblZhbHVlKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkNTU0Z1bmN0aW9uVmFsdWU6OmVxdWFscyk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpDU1NGdW5jdGlvblZhbHVlOjphcHBlbmQpOiBEZWxldGVkLgorICAgICAgICAq IGNzcy9DU1NGdW5jdGlvblZhbHVlLmg6CisgICAgICAgICogY3NzL1N0eWxlQnVpbGRlckNvbnZl cnRlci5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVCdWlsZGVyQ29udmVydGVyOjpjb252ZXJ0 U2Nyb2xsU25hcFBvaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDb252ZXJ0 ZXI6OmNyZWF0ZUdyaWRUcmFja1NpemUpOgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmNyZWF0ZUZpbHRlck9wZXJhdGlv bnMpOgorICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6aXNHcmlkVHJhY2tGaXhlZFNpemVkKToKKwogMjAxNi0xMi0xMyAgSm9zZXBo IFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIw NDE2Myk6IFdlYiBJbnNwZWN0b3I6IFBhZ2UgY3Jhc2hlcyB3aGVuIEluc3BlY3RvciB0cmllcyB0 byBsb2FkIGluc2VjdXJlIFNvdXJjZU1hcApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU0Nv bXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv Y3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAJKHJldmlzaW9uIDIwOTc3NykKKysr IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMDA2LDE5ICsxMDA2LDE5IEBAIHN0YXRpYyBSZWY8Q1NTVmFsdWU+IHNw ZWNpZmllZFZhbHVlRm9yR3IKICAgICBjYXNlIExlbmd0aFRyYWNrU2l6aW5nOgogICAgICAgICBy ZXR1cm4gc3BlY2lmaWVkVmFsdWVGb3JHcmlkVHJhY2tCcmVhZHRoKHRyYWNrU2l6ZS5taW5UcmFj a0JyZWFkdGgoKSwgc3R5bGUpOwogICAgIGNhc2UgRml0Q29udGVudFRyYWNrU2l6aW5nOiB7Ci0g ICAgICAgIGF1dG8gZml0Q29udGVudFRyYWNrU2l6ZSA9IENTU1ZhbHVlTGlzdDo6Y3JlYXRlQ29t bWFTZXBhcmF0ZWQoKTsKKyAgICAgICAgYXV0byBmaXRDb250ZW50VHJhY2tTaXplID0gQ1NTRnVu Y3Rpb25WYWx1ZTo6Y3JlYXRlKENTU1ZhbHVlRml0Q29udGVudCk7CiAgICAgICAgIGZpdENvbnRl bnRUcmFja1NpemUtPmFwcGVuZCh6b29tQWRqdXN0ZWRQaXhlbFZhbHVlRm9yTGVuZ3RoKHRyYWNr U2l6ZS5maXRDb250ZW50VHJhY2tCcmVhZHRoKCkubGVuZ3RoKCksIHN0eWxlKSk7Ci0gICAgICAg IHJldHVybiBDU1NGdW5jdGlvblZhbHVlOjpjcmVhdGUoQ1NTVmFsdWVGaXRDb250ZW50LCBXVEZN b3ZlKGZpdENvbnRlbnRUcmFja1NpemUpKTsKKyAgICAgICAgcmV0dXJuIFdURk1vdmUoZml0Q29u dGVudFRyYWNrU2l6ZSk7CiAgICAgfQogICAgIGRlZmF1bHQ6CiAgICAgICAgIEFTU0VSVCh0cmFj a1NpemUudHlwZSgpID09IE1pbk1heFRyYWNrU2l6aW5nKTsKICAgICAgICAgaWYgKHRyYWNrU2l6 ZS5taW5UcmFja0JyZWFkdGgoKS5pc0F1dG8oKSAmJiB0cmFja1NpemUubWF4VHJhY2tCcmVhZHRo KCkuaXNGbGV4KCkpCiAgICAgICAgICAgICByZXR1cm4gQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24o KS5jcmVhdGVWYWx1ZSh0cmFja1NpemUubWF4VHJhY2tCcmVhZHRoKCkuZmxleCgpLCBDU1NQcmlt aXRpdmVWYWx1ZTo6Q1NTX0ZSKTsKIAotICAgICAgICBhdXRvIG1pbk1heFRyYWNrQnJlYWR0aHMg PSBDU1NWYWx1ZUxpc3Q6OmNyZWF0ZUNvbW1hU2VwYXJhdGVkKCk7CisgICAgICAgIGF1dG8gbWlu TWF4VHJhY2tCcmVhZHRocyA9IENTU0Z1bmN0aW9uVmFsdWU6OmNyZWF0ZShDU1NWYWx1ZU1pbm1h eCk7CiAgICAgICAgIG1pbk1heFRyYWNrQnJlYWR0aHMtPmFwcGVuZChzcGVjaWZpZWRWYWx1ZUZv ckdyaWRUcmFja0JyZWFkdGgodHJhY2tTaXplLm1pblRyYWNrQnJlYWR0aCgpLCBzdHlsZSkpOwog ICAgICAgICBtaW5NYXhUcmFja0JyZWFkdGhzLT5hcHBlbmQoc3BlY2lmaWVkVmFsdWVGb3JHcmlk VHJhY2tCcmVhZHRoKHRyYWNrU2l6ZS5tYXhUcmFja0JyZWFkdGgoKSwgc3R5bGUpKTsKLSAgICAg ICAgcmV0dXJuIENTU0Z1bmN0aW9uVmFsdWU6OmNyZWF0ZShDU1NWYWx1ZU1pbm1heCwgV1RGTW92 ZShtaW5NYXhUcmFja0JyZWFkdGhzKSk7CisgICAgICAgIHJldHVybiBXVEZNb3ZlKG1pbk1heFRy YWNrQnJlYWR0aHMpOwogICAgIH0KIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU0Z1 bmN0aW9uVmFsdWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGdW5j dGlvblZhbHVlLmNwcAkocmV2aXNpb24gMjA5Nzc3KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NT U0Z1bmN0aW9uVmFsdWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw0NyArMjYsMTggQEAKICNp bmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJDU1NGdW5jdGlvblZhbHVlLmgiCiAKLSNpbmNs dWRlICJDU1NWYWx1ZUxpc3QuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+ CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKLQotQ1NTRnVuY3Rpb25WYWx1ZTo6Q1NTRnVuY3Rpb25W YWx1ZShDU1NWYWx1ZUlEIG5hbWUsIFJlZjxDU1NWYWx1ZUxpc3Q+JiYgYXJncykKLSAgICA6IENT U1ZhbHVlKEZ1bmN0aW9uQ2xhc3MpCi0gICAgLCBtX25hbWUobmFtZSkKLSAgICAsIG1fYXJncyhX VEZNb3ZlKGFyZ3MpKQotewotfQotCi1DU1NGdW5jdGlvblZhbHVlOjpDU1NGdW5jdGlvblZhbHVl KENTU1ZhbHVlSUQgbmFtZSkKLSAgICA6IENTU1ZhbHVlKEZ1bmN0aW9uQ2xhc3MpCi0gICAgLCBt X25hbWUobmFtZSkKLXsKLX0KICAgICAKIFN0cmluZyBDU1NGdW5jdGlvblZhbHVlOjpjdXN0b21D U1NUZXh0KCkgY29uc3QKIHsKICAgICBTdHJpbmdCdWlsZGVyIHJlc3VsdDsKLSAgICBpZiAobV9u YW1lICE9IENTU1ZhbHVlSW52YWxpZCkgewotICAgICAgICByZXN1bHQuYXBwZW5kKGdldFZhbHVl TmFtZShtX25hbWUpKTsKLSAgICAgICAgcmVzdWx0LmFwcGVuZCgnKCcpOwotICAgIH0KLSAgICBp ZiAobV9hcmdzKQotICAgICAgICByZXN1bHQuYXBwZW5kKG1fYXJncy0+Y3NzVGV4dCgpKTsKKyAg ICByZXN1bHQuYXBwZW5kKGdldFZhbHVlTmFtZShtX25hbWUpKTsKKyAgICByZXN1bHQuYXBwZW5k KCcoJyk7CisgICAgcmVzdWx0LmFwcGVuZChDU1NWYWx1ZUxpc3Q6OmN1c3RvbUNTU1RleHQoKSk7 CiAgICAgcmVzdWx0LmFwcGVuZCgnKScpOwogICAgIHJldHVybiByZXN1bHQudG9TdHJpbmcoKTsK IH0KIAotYm9vbCBDU1NGdW5jdGlvblZhbHVlOjplcXVhbHMoY29uc3QgQ1NTRnVuY3Rpb25WYWx1 ZSYgb3RoZXIpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fbmFtZSA9PSBvdGhlci5tX25hbWUgJiYg Y29tcGFyZUNTU1ZhbHVlUHRyKG1fYXJncywgb3RoZXIubV9hcmdzKTsKLX0KLQotdm9pZCBDU1NG dW5jdGlvblZhbHVlOjphcHBlbmQoUmVmPENTU1ZhbHVlPiYmIHZhbHVlKQotewotICAgIGlmICgh bV9hcmdzKQotICAgICAgICBtX2FyZ3MgPSBDU1NWYWx1ZUxpc3Q6OmNyZWF0ZUNvbW1hU2VwYXJh dGVkKCk7Ci0gICAgbV9hcmdzLT5hcHBlbmQoV1RGTW92ZSh2YWx1ZSkpOwotfQotCiB9CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRnVuY3Rpb25WYWx1ZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NGdW5jdGlvblZhbHVlLmgJKHJldmlzaW9uIDIwOTc3NykKKysr IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGdW5jdGlvblZhbHVlLmgJKHdvcmtpbmcgY29weSkKQEAg LTI1LDIxICsyNSwxMyBAQAogCiAjcHJhZ21hIG9uY2UKIAotI2luY2x1ZGUgIkNTU1ZhbHVlLmgi CiAjaW5jbHVkZSAiQ1NTVmFsdWVLZXl3b3Jkcy5oIgorI2luY2x1ZGUgIkNTU1ZhbHVlTGlzdC5o IgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIENTU1ZhbHVlTGlzdDsKLQotLy8gRklY TUUtTkVXUEFSU0VSOiBUaGlzIGNhbiBqdXN0ICpiZSogYSBDU1NWYWx1ZUxpc3Qgc3ViY2xhc3Mu Ci1jbGFzcyBDU1NGdW5jdGlvblZhbHVlIGZpbmFsIDogcHVibGljIENTU1ZhbHVlIHsKK2NsYXNz IENTU0Z1bmN0aW9uVmFsdWUgZmluYWwgOiBwdWJsaWMgQ1NTVmFsdWVMaXN0IHsKIHB1YmxpYzoK LSAgICBzdGF0aWMgUmVmPENTU0Z1bmN0aW9uVmFsdWU+IGNyZWF0ZShDU1NWYWx1ZUlEIG5hbWUs IFJlZjxDU1NWYWx1ZUxpc3Q+JiYgYXJncykKLSAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJl ZigqbmV3IENTU0Z1bmN0aW9uVmFsdWUobmFtZSwgV1RGTW92ZShhcmdzKSkpOwotICAgIH0KLQog ICAgIHN0YXRpYyBSZWY8Q1NTRnVuY3Rpb25WYWx1ZT4gY3JlYXRlKENTU1ZhbHVlSUQgbmFtZSkK ICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IENTU0Z1bmN0aW9uVmFsdWUobmFt ZSkpOwpAQCAtNDcsMTkgKzM5LDE4IEBAIHB1YmxpYzoKICAgICAKICAgICBTdHJpbmcgY3VzdG9t Q1NTVGV4dCgpIGNvbnN0OwogCi0gICAgYm9vbCBlcXVhbHMoY29uc3QgQ1NTRnVuY3Rpb25WYWx1 ZSYpIGNvbnN0OwotICAgIAogICAgIENTU1ZhbHVlSUQgbmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1f bmFtZTsgfQotICAgIENTU1ZhbHVlTGlzdCogYXJndW1lbnRzKCkgY29uc3QgeyByZXR1cm4gbV9h cmdzLmdldCgpOyB9CiAKLSAgICB2b2lkIGFwcGVuZChSZWY8Q1NTVmFsdWU+JiYpOworICAgIGJv b2wgZXF1YWxzKGNvbnN0IENTU0Z1bmN0aW9uVmFsdWUmIG90aGVyKSBjb25zdCB7IHJldHVybiBt X25hbWUgPT0gb3RoZXIubV9uYW1lICYmIENTU1ZhbHVlTGlzdDo6ZXF1YWxzKG90aGVyKTsgfQog CiBwcml2YXRlOgotICAgIENTU0Z1bmN0aW9uVmFsdWUoQ1NTVmFsdWVJRCwgUmVmPENTU1ZhbHVl TGlzdD4mJik7Ci0gICAgQ1NTRnVuY3Rpb25WYWx1ZShDU1NWYWx1ZUlEKTsKKyAgICBDU1NGdW5j dGlvblZhbHVlKENTU1ZhbHVlSUQgbmFtZSkKKyAgICAgICAgOiBDU1NWYWx1ZUxpc3QoRnVuY3Rp b25DbGFzcywgQ29tbWFTZXBhcmF0b3IpCisgICAgICAgICwgbV9uYW1lKG5hbWUpCisgICAgewor ICAgIH0KIAogICAgIENTU1ZhbHVlSUQgbV9uYW1lIHsgQ1NTVmFsdWVJbnZhbGlkIH07Ci0gICAg UmVmUHRyPENTU1ZhbHVlTGlzdD4gbV9hcmdzOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaAkocmV2 aXNpb24gMjA5Nzc3KQorKysgU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRl ci5oCSh3b3JraW5nIGNvcHkpCkBAIC04MTgsNyArODE4LDcgQEAgaW5saW5lIHN0ZDo6dW5pcXVl X3B0cjxTY3JvbGxTbmFwUG9pbnRzPgogICAgIGZvciAoYXV0byYgY3VycmVudFZhbHVlIDogZG93 bmNhc3Q8Q1NTVmFsdWVMaXN0Pih2YWx1ZSkpIHsKICAgICAgICAgaWYgKGlzPENTU0Z1bmN0aW9u VmFsdWU+KGN1cnJlbnRWYWx1ZS5nZXQoKSkpIHsKICAgICAgICAgICAgIGF1dG8mIGZ1bmN0aW9u VmFsdWUgPSBkb3duY2FzdDxDU1NGdW5jdGlvblZhbHVlPihjdXJyZW50VmFsdWUuZ2V0KCkpOwot ICAgICAgICAgICAgcG9pbnRzLT5yZXBlYXRPZmZzZXQgPSBwYXJzZVNuYXBDb29yZGluYXRlKHN0 eWxlUmVzb2x2ZXIsICpmdW5jdGlvblZhbHVlLmFyZ3VtZW50cygpLT5pdGVtKDApKTsKKyAgICAg ICAgICAgIHBvaW50cy0+cmVwZWF0T2Zmc2V0ID0gcGFyc2VTbmFwQ29vcmRpbmF0ZShzdHlsZVJl c29sdmVyLCAqZnVuY3Rpb25WYWx1ZS5pdGVtKDApKTsKICAgICAgICAgICAgIHBvaW50cy0+aGFz UmVwZWF0ID0gdHJ1ZTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CkBAIC05MTQsMTQg KzkxNCwxNCBAQCBpbmxpbmUgR3JpZFRyYWNrU2l6ZSBTdHlsZUJ1aWxkZXJDb252ZXJ0CiAgICAg ICAgIHJldHVybiBHcmlkVHJhY2tTaXplKGNyZWF0ZUdyaWRUcmFja0JyZWFkdGgoZG93bmNhc3Q8 Q1NTUHJpbWl0aXZlVmFsdWU+KHZhbHVlKSwgc3R5bGVSZXNvbHZlcikpOwogCiAgICAgQVNTRVJU KGlzPENTU0Z1bmN0aW9uVmFsdWU+KHZhbHVlKSk7Ci0gICAgQ1NTVmFsdWVMaXN0JiBhcmd1bWVu dHMgPSAqZG93bmNhc3Q8Q1NTRnVuY3Rpb25WYWx1ZT4odmFsdWUpLmFyZ3VtZW50cygpOworICAg IGNvbnN0IGF1dG8mIGZ1bmN0aW9uID0gZG93bmNhc3Q8Q1NTRnVuY3Rpb25WYWx1ZT4odmFsdWUp OwogCi0gICAgaWYgKGFyZ3VtZW50cy5sZW5ndGgoKSA9PSAxKQotICAgICAgICByZXR1cm4gR3Jp ZFRyYWNrU2l6ZShjcmVhdGVHcmlkVHJhY2tCcmVhZHRoKGRvd25jYXN0PENTU1ByaW1pdGl2ZVZh bHVlPigqYXJndW1lbnRzLml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMCkpLCBzdHlsZVJlc29sdmVy KSwgRml0Q29udGVudFRyYWNrU2l6aW5nKTsKKyAgICBpZiAoZnVuY3Rpb24ubGVuZ3RoKCkgPT0g MSkKKyAgICAgICAgcmV0dXJuIEdyaWRUcmFja1NpemUoY3JlYXRlR3JpZFRyYWNrQnJlYWR0aChk b3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKmZ1bmN0aW9uLml0ZW1XaXRob3V0Qm91bmRzQ2hl Y2soMCkpLCBzdHlsZVJlc29sdmVyKSwgRml0Q29udGVudFRyYWNrU2l6aW5nKTsKIAotICAgIEFT U0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKGFyZ3VtZW50cy5sZW5ndGgoKSA9PSAyKTsK LSAgICBHcmlkTGVuZ3RoIG1pblRyYWNrQnJlYWR0aChjcmVhdGVHcmlkVHJhY2tCcmVhZHRoKGRv d25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqYXJndW1lbnRzLml0ZW1XaXRob3V0Qm91bmRzQ2hl Y2soMCkpLCBzdHlsZVJlc29sdmVyKSk7Ci0gICAgR3JpZExlbmd0aCBtYXhUcmFja0JyZWFkdGgo Y3JlYXRlR3JpZFRyYWNrQnJlYWR0aChkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKmFyZ3Vt ZW50cy5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDEpKSwgc3R5bGVSZXNvbHZlcikpOworICAgIEFT U0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKGZ1bmN0aW9uLmxlbmd0aCgpID09IDIpOwor ICAgIEdyaWRMZW5ndGggbWluVHJhY2tCcmVhZHRoKGNyZWF0ZUdyaWRUcmFja0JyZWFkdGgoZG93 bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KCpmdW5jdGlvbi5pdGVtV2l0aG91dEJvdW5kc0NoZWNr KDApKSwgc3R5bGVSZXNvbHZlcikpOworICAgIEdyaWRMZW5ndGggbWF4VHJhY2tCcmVhZHRoKGNy ZWF0ZUdyaWRUcmFja0JyZWFkdGgoZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KCpmdW5jdGlv bi5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDEpKSwgc3R5bGVSZXNvbHZlcikpOwogICAgIHJldHVy biBHcmlkVHJhY2tTaXplKG1pblRyYWNrQnJlYWR0aCwgbWF4VHJhY2tCcmVhZHRoKTsKIH0KIApJ bmRleDogU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAkocmV2aXNpb24gMjA5Nzc3KQor KysgU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xOTI0LDIzICsxOTI0LDIyIEBAIGJvb2wgU3R5bGVSZXNvbHZlcjo6Y3JlYXRlRmlsdGVyT3Bl cmF0aW8KIAogICAgICAgICBhdXRvJiBmaWx0ZXJWYWx1ZSA9IGRvd25jYXN0PENTU0Z1bmN0aW9u VmFsdWU+KGN1cnJlbnRWYWx1ZS5nZXQoKSk7CiAgICAgICAgIEZpbHRlck9wZXJhdGlvbjo6T3Bl cmF0aW9uVHlwZSBvcGVyYXRpb25UeXBlID0gZmlsdGVyT3BlcmF0aW9uRm9yVHlwZShmaWx0ZXJW YWx1ZS5uYW1lKCkpOwotICAgICAgICBhdXRvIGFyZ3MgPSBmaWx0ZXJWYWx1ZS5hcmd1bWVudHMo KTsKIAogICAgICAgICAvLyBDaGVjayB0aGF0IGFsbCBwYXJhbWV0ZXJzIGFyZSBwcmltaXRpdmUg dmFsdWVzLCB3aXRoIHRoZQogICAgICAgICAvLyBleGNlcHRpb24gb2YgZHJvcCBzaGFkb3cgd2hp Y2ggaGFzIGEgQ1NTU2hhZG93VmFsdWUgcGFyYW1ldGVyLgogICAgICAgICBjb25zdCBDU1NQcmlt aXRpdmVWYWx1ZSogZmlyc3RWYWx1ZSA9IG51bGxwdHI7Ci0gICAgICAgIGlmIChhcmdzICYmIG9w ZXJhdGlvblR5cGUgIT0gRmlsdGVyT3BlcmF0aW9uOjpEUk9QX1NIQURPVykgeworICAgICAgICBp ZiAob3BlcmF0aW9uVHlwZSAhPSBGaWx0ZXJPcGVyYXRpb246OkRST1BfU0hBRE9XKSB7CiAgICAg ICAgICAgICBib29sIGhhdmVOb25QcmltaXRpdmVWYWx1ZSA9IGZhbHNlOwotICAgICAgICAgICAg Zm9yICh1bnNpZ25lZCBqID0gMDsgaiA8IGFyZ3MtPmxlbmd0aCgpOyArK2opIHsKLSAgICAgICAg ICAgICAgICBpZiAoIWlzPENTU1ByaW1pdGl2ZVZhbHVlPigqYXJncy0+aXRlbVdpdGhvdXRCb3Vu ZHNDaGVjayhqKSkpIHsKKyAgICAgICAgICAgIGZvciAodW5zaWduZWQgaiA9IDA7IGogPCBmaWx0 ZXJWYWx1ZS5sZW5ndGgoKTsgKytqKSB7CisgICAgICAgICAgICAgICAgaWYgKCFpczxDU1NQcmlt aXRpdmVWYWx1ZT4oKmZpbHRlclZhbHVlLml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soaikpKSB7CiAg ICAgICAgICAgICAgICAgICAgIGhhdmVOb25QcmltaXRpdmVWYWx1ZSA9IHRydWU7CiAgICAgICAg ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIGlmIChoYXZlTm9uUHJpbWl0aXZlVmFsdWUpCiAgICAgICAgICAgICAgICAgY29u dGludWU7Ci0gICAgICAgICAgICBpZiAoYXJncy0+bGVuZ3RoKCkpCi0gICAgICAgICAgICAgICAg Zmlyc3RWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPihhcmdzLT5pdGVtV2l0aG91 dEJvdW5kc0NoZWNrKDApKTsKKyAgICAgICAgICAgIGlmIChmaWx0ZXJWYWx1ZS5sZW5ndGgoKSkK KyAgICAgICAgICAgICAgICBmaXJzdFZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+ KGZpbHRlclZhbHVlLml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMCkpOwogICAgICAgICB9CiAKICAg ICAgICAgc3dpdGNoIChvcGVyYXRpb25UeXBlKSB7CkBAIC0xOTQ4LDcgKzE5NDcsNyBAQCBib29s IFN0eWxlUmVzb2x2ZXI6OmNyZWF0ZUZpbHRlck9wZXJhdGlvCiAgICAgICAgIGNhc2UgRmlsdGVy T3BlcmF0aW9uOjpTRVBJQToKICAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlNBVFVSQVRF OiB7CiAgICAgICAgICAgICBkb3VibGUgYW1vdW50ID0gMTsKLSAgICAgICAgICAgIGlmIChhcmdz ICYmIGFyZ3MtPmxlbmd0aCgpID09IDEpIHsKKyAgICAgICAgICAgIGlmIChmaWx0ZXJWYWx1ZS5s ZW5ndGgoKSA9PSAxKSB7CiAgICAgICAgICAgICAgICAgYW1vdW50ID0gZmlyc3RWYWx1ZS0+ZG91 YmxlVmFsdWUoKTsKICAgICAgICAgICAgICAgICBpZiAoZmlyc3RWYWx1ZS0+aXNQZXJjZW50YWdl KCkpCiAgICAgICAgICAgICAgICAgICAgIGFtb3VudCAvPSAxMDA7CkBAIC0xOTU5LDcgKzE5NTgs NyBAQCBib29sIFN0eWxlUmVzb2x2ZXI6OmNyZWF0ZUZpbHRlck9wZXJhdGlvCiAgICAgICAgIH0K ICAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OkhVRV9ST1RBVEU6IHsKICAgICAgICAgICAg IGRvdWJsZSBhbmdsZSA9IDA7Ci0gICAgICAgICAgICBpZiAoYXJncyAmJiBhcmdzLT5sZW5ndGgo KSA9PSAxKQorICAgICAgICAgICAgaWYgKGZpbHRlclZhbHVlLmxlbmd0aCgpID09IDEpCiAgICAg ICAgICAgICAgICAgYW5nbGUgPSBmaXJzdFZhbHVlLT5jb21wdXRlRGVncmVlcygpOwogCiAgICAg ICAgICAgICBvcGVyYXRpb25zLm9wZXJhdGlvbnMoKS5hcHBlbmQoQmFzaWNDb2xvck1hdHJpeEZp bHRlck9wZXJhdGlvbjo6Y3JlYXRlKGFuZ2xlLCBvcGVyYXRpb25UeXBlKSk7CkBAIC0xOTcwLDcg KzE5NjksNyBAQCBib29sIFN0eWxlUmVzb2x2ZXI6OmNyZWF0ZUZpbHRlck9wZXJhdGlvCiAgICAg ICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9uOjpDT05UUkFTVDoKICAgICAgICAgY2FzZSBGaWx0ZXJP cGVyYXRpb246Ok9QQUNJVFk6IHsKICAgICAgICAgICAgIGRvdWJsZSBhbW91bnQgPSAob3BlcmF0 aW9uVHlwZSA9PSBGaWx0ZXJPcGVyYXRpb246OkJSSUdIVE5FU1MpID8gMCA6IDE7Ci0gICAgICAg ICAgICBpZiAoYXJncyAmJiBhcmdzLT5sZW5ndGgoKSA9PSAxKSB7CisgICAgICAgICAgICBpZiAo ZmlsdGVyVmFsdWUubGVuZ3RoKCkgPT0gMSkgewogICAgICAgICAgICAgICAgIGFtb3VudCA9IGZp cnN0VmFsdWUtPmRvdWJsZVZhbHVlKCk7CiAgICAgICAgICAgICAgICAgaWYgKGZpcnN0VmFsdWUt PmlzUGVyY2VudGFnZSgpKQogICAgICAgICAgICAgICAgICAgICBhbW91bnQgLz0gMTAwOwpAQCAt MTk4MSw3ICsxOTgwLDcgQEAgYm9vbCBTdHlsZVJlc29sdmVyOjpjcmVhdGVGaWx0ZXJPcGVyYXRp bwogICAgICAgICB9CiAgICAgICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9uOjpCTFVSOiB7CiAgICAg ICAgICAgICBMZW5ndGggc3RkRGV2aWF0aW9uID0gTGVuZ3RoKDAsIEZpeGVkKTsKLSAgICAgICAg ICAgIGlmIChhcmdzICYmIGFyZ3MtPmxlbmd0aCgpID49IDEpCisgICAgICAgICAgICBpZiAoZmls dGVyVmFsdWUubGVuZ3RoKCkgPj0gMSkKICAgICAgICAgICAgICAgICBzdGREZXZpYXRpb24gPSBj b252ZXJ0VG9GbG9hdExlbmd0aChmaXJzdFZhbHVlLCBzdGF0ZS5jc3NUb0xlbmd0aENvbnZlcnNp b25EYXRhKCkpOwogICAgICAgICAgICAgaWYgKHN0ZERldmlhdGlvbi5pc1VuZGVmaW5lZCgpKQog ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTE5OTAsMTQgKzE5ODksMTQgQEAgYm9v bCBTdHlsZVJlc29sdmVyOjpjcmVhdGVGaWx0ZXJPcGVyYXRpbwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OkRST1BfU0hBRE9XOiB7 Ci0gICAgICAgICAgICBpZiAoYXJncyAmJiBhcmdzLT5sZW5ndGgoKSAhPSAxKQorICAgICAgICAg ICAgaWYgKGZpbHRlclZhbHVlLmxlbmd0aCgpICE9IDEpCiAgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogCi0gICAgICAgICAgICBhdXRvJiBjc3NWYWx1ZSA9ICphcmdzLT5pdGVtV2l0aG91 dEJvdW5kc0NoZWNrKDApOworICAgICAgICAgICAgY29uc3QgYXV0byogY3NzVmFsdWUgPSBmaWx0 ZXJWYWx1ZS5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDApOwogICAgICAgICAgICAgaWYgKCFpczxD U1NTaGFkb3dWYWx1ZT4oY3NzVmFsdWUpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0g ICAgICAgICAgICBhdXRvJiBpdGVtID0gZG93bmNhc3Q8Q1NTU2hhZG93VmFsdWU+KGNzc1ZhbHVl KTsKKyAgICAgICAgICAgIGNvbnN0IGF1dG8mIGl0ZW0gPSBkb3duY2FzdDxDU1NTaGFkb3dWYWx1 ZT4oKmNzc1ZhbHVlKTsKICAgICAgICAgICAgIGludCB4ID0gaXRlbS54LT5jb21wdXRlTGVuZ3Ro PGludD4oc3RhdGUuY3NzVG9MZW5ndGhDb252ZXJzaW9uRGF0YSgpKTsKICAgICAgICAgICAgIGlu dCB5ID0gaXRlbS55LT5jb21wdXRlTGVuZ3RoPGludD4oc3RhdGUuY3NzVG9MZW5ndGhDb252ZXJz aW9uRGF0YSgpKTsKICAgICAgICAgICAgIEludFBvaW50IGxvY2F0aW9uKHgsIHkpOwpJbmRleDog U291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAJKHJl dmlzaW9uIDIwOTc3NykKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQ YXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDk2LDExICszMDk2LDExIEBAIHN0YXRpYyBi b29sIGlzR3JpZFRyYWNrRml4ZWRTaXplZChjb25zdCAKIAogICAgIEFTU0VSVCh2YWx1ZS5pc0Z1 bmN0aW9uVmFsdWUoKSk7CiAgICAgYXV0byYgZnVuY3Rpb24gPSBkb3duY2FzdDxDU1NGdW5jdGlv blZhbHVlPih2YWx1ZSk7Ci0gICAgaWYgKGZ1bmN0aW9uLm5hbWUoKSA9PSBDU1NWYWx1ZUZpdENv bnRlbnQgfHwgZnVuY3Rpb24uYXJndW1lbnRzKCkgPT0gbnVsbHB0ciB8fCBmdW5jdGlvbi5hcmd1 bWVudHMoKS0+bGVuZ3RoKCkgPCAyKQorICAgIGlmIChmdW5jdGlvbi5uYW1lKCkgPT0gQ1NTVmFs dWVGaXRDb250ZW50IHx8IGZ1bmN0aW9uLmxlbmd0aCgpIDwgMikKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgQ1NTVmFsdWUqIG1pblByaW1pdGl2ZVZhbHVlID0gZG93bmNhc3Q8Q1NTUHJp bWl0aXZlVmFsdWU+KGZ1bmN0aW9uLmFyZ3VtZW50cygpLT5pdGVtKDApKTsKLSAgICBDU1NWYWx1 ZSogbWF4UHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oZnVuY3Rp b24uYXJndW1lbnRzKCktPml0ZW0oMSkpOworICAgIGNvbnN0IENTU1ZhbHVlKiBtaW5QcmltaXRp dmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPihmdW5jdGlvbi5pdGVtKDApKTsK KyAgICBjb25zdCBDU1NWYWx1ZSogbWF4UHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQcmlt aXRpdmVWYWx1ZT4oZnVuY3Rpb24uaXRlbSgxKSk7CiAgICAgcmV0dXJuIGlzR3JpZFRyYWNrRml4 ZWRTaXplZCgqbWluUHJpbWl0aXZlVmFsdWUpIHx8IGlzR3JpZFRyYWNrRml4ZWRTaXplZCgqbWF4 UHJpbWl0aXZlVmFsdWUpOwogfQogCg==