16751 2008-01-05 14:22:03 -0800 Failing to parse "html*.test" correctly as CSS selector (Acid3 bug) 2008-02-04 14:16:56 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac OS X 10.4 RESOLVED FIXED http://www.hixie.ch/tests/evil/acid/003/ HasReduction P2 Normal --- 15508 17064 1 eric hyatt webkit oldest_to_newest 66306 0 eric 2008-01-05 14:22:03 -0800 Failing to parse "html*.test" correctly as CSS selector (Acid3 bug) Test 44: FAIL (expected 0, got 1 - misparsed selectors) function () { // test 44: selectors without spaces before a "*" selectorTest(function (doc, add, expect) { doc.body.className = "test"; var p = doc.createElement('p'); p.className = "test"; doc.body.appendChild(p); add("html*.test"); expect(doc.body, 0, "misparsed selectors"); expect(p, 0, "really misparsed selectors"); }); return 3; }, 68390 1 18727 webkit 2008-01-27 15:32:22 -0800 Created attachment 18727 Minimal test case 69372 2 18913 hyatt 2008-02-04 12:00:34 -0800 Created attachment 18913 Patch that fixes the bug Will land test case from bug as layout test. 69384 3 18917 hyatt 2008-02-04 13:15:18 -0800 Created attachment 18917 Shrink the patch a bit. 69388 4 18917 darin 2008-02-04 13:38:37 -0800 Comment on attachment 18917 Shrink the patch a bit. This looks like it relies on how bison handles conflicts. Anywhere we say "selector" it could expand to "selector_with_trailing_whitespace" so it's all about how it reduces. Do we have sufficient test coverage for CSS selector parsing? I'd like to see a lot of tests in this area. r=me, more based on the theory that this is thoroughly tested rather than on my certainty that I can validate this from proofreading the code. I'd also like to see this grammar fixed to remove all the conflicts; that would make it easier to understand the behavior by looking at the code, although it would make the grammar more complex. 69391 5 hyatt 2008-02-04 14:10:36 -0800 I don't believe it does rely on how Bison handles conflicts. The patch forces whitespace following a selector to resolve into "selector_with_trailing_whitespace." There is no other reduce option for whitespace following a selector. 69392 6 hyatt 2008-02-04 14:16:56 -0800 Fixed in r29976-8. 18727 2008-01-27 15:32:22 -0800 2008-01-27 15:32:22 -0800 Minimal test case bug-16751-minimal-test-case.html text/html 319 webkit PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIiAiaHR0cDov L3d3dy53My5vcmcvVFIvaHRtbDQvc3RyaWN0LmR0ZCI+CjxodG1sPgo8aGVhZD4KPHRpdGxlPlRl c3QgY2FzZSBmb3IgaHRtbCoudGVzdCBzZWxlY3RvcjwvdGl0bGU+CjxzdHlsZSB0eXBlPSJ0ZXh0 L2NzcyI+Cmh0bWwqLnRlc3QgeyBiYWNrZ3JvdW5kLWNvbG9yOiByZWQ7IH0KPC9zdHlsZT4KPC9o ZWFkPgo8Ym9keT4KPHAgY2xhc3M9InRlc3QiPlRoaXMgZWxlbWVudCBTSE9VTEQgTk9UIGhhdmUg UkVEIGJhY2tncm91bmQ8L3A+CjwvYm9keT4KPC9odG1sPg== 18913 2008-02-04 12:00:34 -0800 2008-02-04 13:15:18 -0800 Patch that fixes the bug patch.txt text/plain 5655 hyatt SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI5OTY4 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDgtMDIt MDQgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBmb3IgYnVn IDE2NzUxLCBtaXNwYXJzaW5nIG9mIGh0bWwqLnRlc3QgaW4gQ1NTLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGZhc3QvY3NzL3NpbXBsZS1z ZWxlY3Rvci1jaGFpbi1wYXJzaW5nLmh0bWwKKworICAgICAgICAqIGNzcy9DU1NHcmFtbWFyLnk6 CisKIDIwMDgtMDItMDQgICBEYXZpZCBIYXJyaXNvbiAgPGhhcnJpc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBUaW0gSGF0Y2hlci4KSW5kZXg6IGNzcy9DU1NHcmFtbWFyLnkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gY3NzL0NTU0dyYW1tYXIueQkocmV2aXNpb24gMjk5NDMpCisrKyBjc3Mv Q1NTR3JhbW1hci55CSh3b3JraW5nIGNvcHkpCkBAIC0yNjIsNiArMjYyLDcgQEAgc3RhdGljIGlu dCBjc3N5eWxleChZWVNUWVBFKiB5eWx2YWwpIHsgcgogJXR5cGUgPHNlbGVjdG9yPiBzaW1wbGVf c2VsZWN0b3IKICV0eXBlIDxzZWxlY3Rvcj4gc2VsZWN0b3IKICV0eXBlIDxzZWxlY3Rvcj4gc2Vs ZWN0b3JfbGlzdAorJXR5cGUgPHNlbGVjdG9yPiBzZWxlY3Rvcl93aXRoX3RyYWlsaW5nX3doaXRl c3BhY2UKICV0eXBlIDxzZWxlY3Rvcj4gY2xhc3MKICV0eXBlIDxzZWxlY3Rvcj4gYXR0cmliCiAl dHlwZSA8c2VsZWN0b3I+IHBzZXVkbwpAQCAtNTc1LDcgKzU3Niw2IEBAIGNvbWJpbmF0b3I6CiAg ICAgJysnIG1heWJlX3NwYWNlIHsgJCQgPSBDU1NTZWxlY3Rvcjo6RGlyZWN0QWRqYWNlbnQ7IH0K ICAgfCAnficgbWF5YmVfc3BhY2UgeyAkJCA9IENTU1NlbGVjdG9yOjpJbmRpcmVjdEFkamFjZW50 OyB9CiAgIHwgJz4nIG1heWJlX3NwYWNlIHsgJCQgPSBDU1NTZWxlY3Rvcjo6Q2hpbGQ7IH0KLSAg fCAvKiBlbXB0eSAqLyB7ICQkID0gQ1NTU2VsZWN0b3I6OkRlc2NlbmRhbnQ7IH0KICAgOwogCiB1 bmFyeV9vcGVyYXRvcjoKQEAgLTU5MCw3ICs1OTAsNyBAQCBydWxlc2V0OgogICA7CiAKIHNlbGVj dG9yX2xpc3Q6Ci0gICAgc2VsZWN0b3IgJXByZWMgVU5JTVBPUlRBTlRfVE9LIHsKKyAgICBzZWxl Y3RvciBtYXliZV9zcGFjZSAlcHJlYyBVTklNUE9SVEFOVF9UT0sgewogICAgICAgICAkJCA9ICQx OwogICAgIH0KICAgICB8IHNlbGVjdG9yX2xpc3QgJywnIG1heWJlX3NwYWNlIHNlbGVjdG9yICVw cmVjIFVOSU1QT1JUQU5UX1RPSyB7CkBAIC02MDYsMTAgKzYwNiwzNiBAQCBzZWxlY3Rvcl9saXN0 OgogICAgIH0KICAgIDsKIAorc2VsZWN0b3Jfd2l0aF90cmFpbGluZ193aGl0ZXNwYWNlOgorICAg IHNlbGVjdG9yIFdISVRFU1BBQ0UgeworICAgICAgICAkJCA9ICQxOworICAgIH0KKyAgICA7CisK IHNlbGVjdG9yOgogICAgIHNpbXBsZV9zZWxlY3RvciB7CiAgICAgICAgICQkID0gJDE7CiAgICAg fQorICAgIHwgc2VsZWN0b3Jfd2l0aF90cmFpbGluZ193aGl0ZXNwYWNlCisgICAgeworICAgICAg ICAkJCA9ICQxOworICAgIH0KKyAgICB8IHNlbGVjdG9yX3dpdGhfdHJhaWxpbmdfd2hpdGVzcGFj ZSBzaW1wbGVfc2VsZWN0b3IKKyAgICB7CisgICAgICAgICQkID0gJDI7CisgICAgICAgIGlmICgh JDEpCisgICAgICAgICAgICAkJCA9IDA7CisgICAgICAgIGVsc2UgaWYgKCQkKSB7CisgICAgICAg ICAgICBDU1NQYXJzZXIqIHAgPSBzdGF0aWNfY2FzdDxDU1NQYXJzZXIqPihwYXJzZXIpOworICAg ICAgICAgICAgQ1NTU2VsZWN0b3IqIGVuZCA9ICQkOworICAgICAgICAgICAgd2hpbGUgKGVuZC0+ bV90YWdIaXN0b3J5KQorICAgICAgICAgICAgICAgIGVuZCA9IGVuZC0+bV90YWdIaXN0b3J5Owor ICAgICAgICAgICAgZW5kLT5tX3JlbGF0aW9uID0gQ1NTU2VsZWN0b3I6OkRlc2NlbmRhbnQ7Cisg ICAgICAgICAgICBlbmQtPm1fdGFnSGlzdG9yeSA9IHAtPnNpbmtGbG9hdGluZ1NlbGVjdG9yKCQx KTsKKyAgICAgICAgICAgIGlmIChEb2N1bWVudCogZG9jID0gcC0+ZG9jdW1lbnQoKSkKKyAgICAg ICAgICAgICAgICBkb2MtPnNldFVzZXNEZXNjZW5kYW50UnVsZXModHJ1ZSk7CisgICAgICAgIH0K KyAgICB9CiAgICAgfCBzZWxlY3RvciBjb21iaW5hdG9yIHNpbXBsZV9zZWxlY3RvciB7CiAgICAg ICAgICQkID0gJDM7CiAgICAgICAgIGlmICghJDEpCkBAIC02MjEsNyArNjQ3LDcgQEAgc2VsZWN0 b3I6CiAgICAgICAgICAgICAgICAgZW5kID0gZW5kLT5tX3RhZ0hpc3Rvcnk7CiAgICAgICAgICAg ICBlbmQtPm1fcmVsYXRpb24gPSAkMjsKICAgICAgICAgICAgIGVuZC0+bV90YWdIaXN0b3J5ID0g cC0+c2lua0Zsb2F0aW5nU2VsZWN0b3IoJDEpOwotICAgICAgICAgICAgaWYgKCQyID09IENTU1Nl bGVjdG9yOjpEZXNjZW5kYW50IHx8ICQyID09IENTU1NlbGVjdG9yOjpDaGlsZCkgeworICAgICAg ICAgICAgaWYgKCQyID09IENTU1NlbGVjdG9yOjpDaGlsZCkgewogICAgICAgICAgICAgICAgIGlm IChEb2N1bWVudCogZG9jID0gcC0+ZG9jdW1lbnQoKSkKICAgICAgICAgICAgICAgICAgICAgZG9j LT5zZXRVc2VzRGVzY2VuZGFudFJ1bGVzKHRydWUpOwogICAgICAgICAgICAgfSBlbHNlIGlmICgk MiA9PSBDU1NTZWxlY3Rvcjo6RGlyZWN0QWRqYWNlbnQgfHwgJDIgPT0gQ1NTU2VsZWN0b3I6Oklu ZGlyZWN0QWRqYWNlbnQpIHsKQEAgLTY0MCwyNyArNjY2LDI3IEBAIG5hbWVzcGFjZV9zZWxlY3Rv cjoKICAgICB8ICcqJyAnfCcgeyBzdGF0aWMgVUNoYXIgc3RhciA9ICcqJzsgJCQuY2hhcmFjdGVy cyA9ICZzdGFyOyAkJC5sZW5ndGggPSAxOyB9CiAgICAgfCBJREVOVCAnfCcgeyAkJCA9ICQxOyB9 CiA7Ci0KKyAgICAKIHNpbXBsZV9zZWxlY3RvcjoKLSAgICBlbGVtZW50X25hbWUgbWF5YmVfc3Bh Y2UgeworICAgIGVsZW1lbnRfbmFtZSB7CiAgICAgICAgIENTU1BhcnNlciogcCA9IHN0YXRpY19j YXN0PENTU1BhcnNlcio+KHBhcnNlcik7CiAgICAgICAgICQkID0gcC0+Y3JlYXRlRmxvYXRpbmdT ZWxlY3RvcigpOwogICAgICAgICAkJC0+bV90YWcgPSBRdWFsaWZpZWROYW1lKG51bGxBdG9tLCBh dG9taWNTdHJpbmcoJDEpLCBwLT5kZWZhdWx0TmFtZXNwYWNlKTsKICAgICB9Ci0gICAgfCBlbGVt ZW50X25hbWUgc3BlY2lmaWVyX2xpc3QgbWF5YmVfc3BhY2UgeworICAgIHwgZWxlbWVudF9uYW1l IHNwZWNpZmllcl9saXN0IHsKICAgICAgICAgJCQgPSAkMjsKICAgICAgICAgaWYgKCQkKSB7CiAg ICAgICAgICAgICBDU1NQYXJzZXIqIHAgPSBzdGF0aWNfY2FzdDxDU1NQYXJzZXIqPihwYXJzZXIp OwogICAgICAgICAgICAgJCQtPm1fdGFnID0gUXVhbGlmaWVkTmFtZShudWxsQXRvbSwgYXRvbWlj U3RyaW5nKCQxKSwgcC0+ZGVmYXVsdE5hbWVzcGFjZSk7CiAgICAgICAgIH0KICAgICB9Ci0gICAg fCBzcGVjaWZpZXJfbGlzdCBtYXliZV9zcGFjZSB7CisgICAgfCBzcGVjaWZpZXJfbGlzdCB7CiAg ICAgICAgICQkID0gJDE7CiAgICAgICAgIENTU1BhcnNlciogcCA9IHN0YXRpY19jYXN0PENTU1Bh cnNlcio+KHBhcnNlcik7CiAgICAgICAgIGlmICgkJCAmJiBwLT5kZWZhdWx0TmFtZXNwYWNlICE9 IHN0YXJBdG9tKQogICAgICAgICAgICAgJCQtPm1fdGFnID0gUXVhbGlmaWVkTmFtZShudWxsQXRv bSwgc3RhckF0b20sIHAtPmRlZmF1bHROYW1lc3BhY2UpOwogICAgIH0KLSAgICB8IG5hbWVzcGFj ZV9zZWxlY3RvciBlbGVtZW50X25hbWUgbWF5YmVfc3BhY2UgeworICAgIHwgbmFtZXNwYWNlX3Nl bGVjdG9yIGVsZW1lbnRfbmFtZSB7CiAgICAgICAgIEF0b21pY1N0cmluZyBuYW1lc3BhY2VQcmVm aXggPSBhdG9taWNTdHJpbmcoJDEpOwogICAgICAgICBDU1NQYXJzZXIqIHAgPSBzdGF0aWNfY2Fz dDxDU1NQYXJzZXIqPihwYXJzZXIpOwogICAgICAgICAkJCA9IHAtPmNyZWF0ZUZsb2F0aW5nU2Vs ZWN0b3IoKTsKQEAgLTY3MSw3ICs2OTcsNyBAQCBzaW1wbGVfc2VsZWN0b3I6CiAgICAgICAgIGVs c2UgLy8gRklYTUU6IFNob3VsZG4ndCB0aGlzIGNhc2UgYmUgYW4gZXJyb3I/CiAgICAgICAgICAg ICAkJC0+bV90YWcgPSBRdWFsaWZpZWROYW1lKG51bGxBdG9tLCBhdG9taWNTdHJpbmcoJDIpLCBw LT5kZWZhdWx0TmFtZXNwYWNlKTsKICAgICB9Ci0gICAgfCBuYW1lc3BhY2Vfc2VsZWN0b3IgZWxl bWVudF9uYW1lIHNwZWNpZmllcl9saXN0IG1heWJlX3NwYWNlIHsKKyAgICB8IG5hbWVzcGFjZV9z ZWxlY3RvciBlbGVtZW50X25hbWUgc3BlY2lmaWVyX2xpc3QgewogICAgICAgICAkJCA9ICQzOwog ICAgICAgICBpZiAoJCQpIHsKICAgICAgICAgICAgIEF0b21pY1N0cmluZyBuYW1lc3BhY2VQcmVm aXggPSBhdG9taWNTdHJpbmcoJDEpOwpAQCAtNjg0LDcgKzcxMCw3IEBAIHNpbXBsZV9zZWxlY3Rv cjoKICAgICAgICAgICAgICAgICAkJC0+bV90YWcgPSBRdWFsaWZpZWROYW1lKG51bGxBdG9tLCBh dG9taWNTdHJpbmcoJDIpLCBwLT5kZWZhdWx0TmFtZXNwYWNlKTsKICAgICAgICAgfQogICAgIH0K LSAgICB8IG5hbWVzcGFjZV9zZWxlY3RvciBzcGVjaWZpZXJfbGlzdCBtYXliZV9zcGFjZSB7Cisg ICAgfCBuYW1lc3BhY2Vfc2VsZWN0b3Igc3BlY2lmaWVyX2xpc3QgewogICAgICAgICAkJCA9ICQy OwogICAgICAgICBpZiAoJCQpIHsKICAgICAgICAgICAgIEF0b21pY1N0cmluZyBuYW1lc3BhY2VQ cmVmaXggPSBhdG9taWNTdHJpbmcoJDEpOwpAQCAtODU2LDkgKzg4Miw3IEBAIHBzZXVkbzoKICAg ICAgICAgICAgICQkID0gMDsKICAgICAgICAgZWxzZSBpZiAodHlwZSA9PSBDU1NTZWxlY3Rvcjo6 UHNldWRvRW1wdHkgfHwKICAgICAgICAgICAgICAgICAgdHlwZSA9PSBDU1NTZWxlY3Rvcjo6UHNl dWRvRmlyc3RDaGlsZCB8fAotICAgICAgICAgICAgICAgICB0eXBlID09IENTU1NlbGVjdG9yOjpQ c2V1ZG9GaXJzdE9mVHlwZSB8fAotICAgICAgICAgICAgICAgICB0eXBlID09IENTU1NlbGVjdG9y OjpQc2V1ZG9MYXN0Q2hpbGQgfHwKLSAgICAgICAgICAgICAgICAgdHlwZSA9PSBDU1NTZWxlY3Rv cjo6UHNldWRvTGFzdE9mVHlwZSkgeworICAgICAgICAgICAgICAgICB0eXBlID09IENTU1NlbGVj dG9yOjpQc2V1ZG9GaXJzdE9mVHlwZSkgewogICAgICAgICAgICAgQ1NTUGFyc2VyKiBwID0gc3Rh dGljX2Nhc3Q8Q1NTUGFyc2VyKj4ocGFyc2VyKTsKICAgICAgICAgICAgIERvY3VtZW50KiBkb2Mg PSBwLT5kb2N1bWVudCgpOwogICAgICAgICAgICAgaWYgKGRvYykKQEAgLTg5NCw3ICs5MTgsNyBA QCBwc2V1ZG86CiAgICAgICAgICAgICAkJCA9IDA7CiAgICAgfQogICAgIC8vIHVzZWQgYnkgOm5v dAotICAgIHwgJzonIE5PVEZVTkNUSU9OIG1heWJlX3NwYWNlIHNpbXBsZV9zZWxlY3RvciAnKScg eworICAgIHwgJzonIE5PVEZVTkNUSU9OIG1heWJlX3NwYWNlIHNpbXBsZV9zZWxlY3RvciBtYXli ZV9zcGFjZSAnKScgewogICAgICAgICBpZiAoISQ0KQogICAgICAgICAgICAgJCQgPSAwOwogICAg ICAgICBlbHNlIHsK 18917 2008-02-04 13:15:18 -0800 2008-02-04 13:38:37 -0800 Shrink the patch a bit. patch.txt text/plain 5420 hyatt SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI5OTY4 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDgtMDIt MDQgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBmb3IgYnVn IDE2NzUxLCBtaXNwYXJzaW5nIG9mIGh0bWwqLnRlc3QgaW4gQ1NTLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGZhc3QvY3NzL3NpbXBsZS1z ZWxlY3Rvci1jaGFpbi1wYXJzaW5nLmh0bWwKKworICAgICAgICAqIGNzcy9DU1NHcmFtbWFyLnk6 CisKIDIwMDgtMDItMDQgICBEYXZpZCBIYXJyaXNvbiAgPGhhcnJpc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBUaW0gSGF0Y2hlci4KSW5kZXg6IGNzcy9DU1NHcmFtbWFyLnkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gY3NzL0NTU0dyYW1tYXIueQkocmV2aXNpb24gMjk5NDMpCisrKyBjc3Mv Q1NTR3JhbW1hci55CSh3b3JraW5nIGNvcHkpCkBAIC0yNjIsNiArMjYyLDcgQEAgc3RhdGljIGlu dCBjc3N5eWxleChZWVNUWVBFKiB5eWx2YWwpIHsgcgogJXR5cGUgPHNlbGVjdG9yPiBzaW1wbGVf c2VsZWN0b3IKICV0eXBlIDxzZWxlY3Rvcj4gc2VsZWN0b3IKICV0eXBlIDxzZWxlY3Rvcj4gc2Vs ZWN0b3JfbGlzdAorJXR5cGUgPHNlbGVjdG9yPiBzZWxlY3Rvcl93aXRoX3RyYWlsaW5nX3doaXRl c3BhY2UKICV0eXBlIDxzZWxlY3Rvcj4gY2xhc3MKICV0eXBlIDxzZWxlY3Rvcj4gYXR0cmliCiAl dHlwZSA8c2VsZWN0b3I+IHBzZXVkbwpAQCAtNTc1LDcgKzU3Niw2IEBAIGNvbWJpbmF0b3I6CiAg ICAgJysnIG1heWJlX3NwYWNlIHsgJCQgPSBDU1NTZWxlY3Rvcjo6RGlyZWN0QWRqYWNlbnQ7IH0K ICAgfCAnficgbWF5YmVfc3BhY2UgeyAkJCA9IENTU1NlbGVjdG9yOjpJbmRpcmVjdEFkamFjZW50 OyB9CiAgIHwgJz4nIG1heWJlX3NwYWNlIHsgJCQgPSBDU1NTZWxlY3Rvcjo6Q2hpbGQ7IH0KLSAg fCAvKiBlbXB0eSAqLyB7ICQkID0gQ1NTU2VsZWN0b3I6OkRlc2NlbmRhbnQ7IH0KICAgOwogCiB1 bmFyeV9vcGVyYXRvcjoKQEAgLTYwNiwxMCArNjA2LDM2IEBAIHNlbGVjdG9yX2xpc3Q6CiAgICAg fQogICAgOwogCitzZWxlY3Rvcl93aXRoX3RyYWlsaW5nX3doaXRlc3BhY2U6CisgICAgc2VsZWN0 b3IgV0hJVEVTUEFDRSB7CisgICAgICAgICQkID0gJDE7CisgICAgfQorICAgIDsKKwogc2VsZWN0 b3I6CiAgICAgc2ltcGxlX3NlbGVjdG9yIHsKICAgICAgICAgJCQgPSAkMTsKICAgICB9CisgICAg fCBzZWxlY3Rvcl93aXRoX3RyYWlsaW5nX3doaXRlc3BhY2UKKyAgICB7CisgICAgICAgICQkID0g JDE7CisgICAgfQorICAgIHwgc2VsZWN0b3Jfd2l0aF90cmFpbGluZ193aGl0ZXNwYWNlIHNpbXBs ZV9zZWxlY3RvcgorICAgIHsKKyAgICAgICAgJCQgPSAkMjsKKyAgICAgICAgaWYgKCEkMSkKKyAg ICAgICAgICAgICQkID0gMDsKKyAgICAgICAgZWxzZSBpZiAoJCQpIHsKKyAgICAgICAgICAgIENT U1BhcnNlciogcCA9IHN0YXRpY19jYXN0PENTU1BhcnNlcio+KHBhcnNlcik7CisgICAgICAgICAg ICBDU1NTZWxlY3RvciogZW5kID0gJCQ7CisgICAgICAgICAgICB3aGlsZSAoZW5kLT5tX3RhZ0hp c3RvcnkpCisgICAgICAgICAgICAgICAgZW5kID0gZW5kLT5tX3RhZ0hpc3Rvcnk7CisgICAgICAg ICAgICBlbmQtPm1fcmVsYXRpb24gPSBDU1NTZWxlY3Rvcjo6RGVzY2VuZGFudDsKKyAgICAgICAg ICAgIGVuZC0+bV90YWdIaXN0b3J5ID0gcC0+c2lua0Zsb2F0aW5nU2VsZWN0b3IoJDEpOworICAg ICAgICAgICAgaWYgKERvY3VtZW50KiBkb2MgPSBwLT5kb2N1bWVudCgpKQorICAgICAgICAgICAg ICAgIGRvYy0+c2V0VXNlc0Rlc2NlbmRhbnRSdWxlcyh0cnVlKTsKKyAgICAgICAgfQorICAgIH0K ICAgICB8IHNlbGVjdG9yIGNvbWJpbmF0b3Igc2ltcGxlX3NlbGVjdG9yIHsKICAgICAgICAgJCQg PSAkMzsKICAgICAgICAgaWYgKCEkMSkKQEAgLTYyMSw3ICs2NDcsNyBAQCBzZWxlY3RvcjoKICAg ICAgICAgICAgICAgICBlbmQgPSBlbmQtPm1fdGFnSGlzdG9yeTsKICAgICAgICAgICAgIGVuZC0+ bV9yZWxhdGlvbiA9ICQyOwogICAgICAgICAgICAgZW5kLT5tX3RhZ0hpc3RvcnkgPSBwLT5zaW5r RmxvYXRpbmdTZWxlY3RvcigkMSk7Ci0gICAgICAgICAgICBpZiAoJDIgPT0gQ1NTU2VsZWN0b3I6 OkRlc2NlbmRhbnQgfHwgJDIgPT0gQ1NTU2VsZWN0b3I6OkNoaWxkKSB7CisgICAgICAgICAgICBp ZiAoJDIgPT0gQ1NTU2VsZWN0b3I6OkNoaWxkKSB7CiAgICAgICAgICAgICAgICAgaWYgKERvY3Vt ZW50KiBkb2MgPSBwLT5kb2N1bWVudCgpKQogICAgICAgICAgICAgICAgICAgICBkb2MtPnNldFVz ZXNEZXNjZW5kYW50UnVsZXModHJ1ZSk7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKCQyID09IENT U1NlbGVjdG9yOjpEaXJlY3RBZGphY2VudCB8fCAkMiA9PSBDU1NTZWxlY3Rvcjo6SW5kaXJlY3RB ZGphY2VudCkgewpAQCAtNjQwLDI3ICs2NjYsMjcgQEAgbmFtZXNwYWNlX3NlbGVjdG9yOgogICAg IHwgJyonICd8JyB7IHN0YXRpYyBVQ2hhciBzdGFyID0gJyonOyAkJC5jaGFyYWN0ZXJzID0gJnN0 YXI7ICQkLmxlbmd0aCA9IDE7IH0KICAgICB8IElERU5UICd8JyB7ICQkID0gJDE7IH0KIDsKLQor ICAgIAogc2ltcGxlX3NlbGVjdG9yOgotICAgIGVsZW1lbnRfbmFtZSBtYXliZV9zcGFjZSB7Cisg ICAgZWxlbWVudF9uYW1lIHsKICAgICAgICAgQ1NTUGFyc2VyKiBwID0gc3RhdGljX2Nhc3Q8Q1NT UGFyc2VyKj4ocGFyc2VyKTsKICAgICAgICAgJCQgPSBwLT5jcmVhdGVGbG9hdGluZ1NlbGVjdG9y KCk7CiAgICAgICAgICQkLT5tX3RhZyA9IFF1YWxpZmllZE5hbWUobnVsbEF0b20sIGF0b21pY1N0 cmluZygkMSksIHAtPmRlZmF1bHROYW1lc3BhY2UpOwogICAgIH0KLSAgICB8IGVsZW1lbnRfbmFt ZSBzcGVjaWZpZXJfbGlzdCBtYXliZV9zcGFjZSB7CisgICAgfCBlbGVtZW50X25hbWUgc3BlY2lm aWVyX2xpc3QgewogICAgICAgICAkJCA9ICQyOwogICAgICAgICBpZiAoJCQpIHsKICAgICAgICAg ICAgIENTU1BhcnNlciogcCA9IHN0YXRpY19jYXN0PENTU1BhcnNlcio+KHBhcnNlcik7CiAgICAg ICAgICAgICAkJC0+bV90YWcgPSBRdWFsaWZpZWROYW1lKG51bGxBdG9tLCBhdG9taWNTdHJpbmco JDEpLCBwLT5kZWZhdWx0TmFtZXNwYWNlKTsKICAgICAgICAgfQogICAgIH0KLSAgICB8IHNwZWNp Zmllcl9saXN0IG1heWJlX3NwYWNlIHsKKyAgICB8IHNwZWNpZmllcl9saXN0IHsKICAgICAgICAg JCQgPSAkMTsKICAgICAgICAgQ1NTUGFyc2VyKiBwID0gc3RhdGljX2Nhc3Q8Q1NTUGFyc2VyKj4o cGFyc2VyKTsKICAgICAgICAgaWYgKCQkICYmIHAtPmRlZmF1bHROYW1lc3BhY2UgIT0gc3RhckF0 b20pCiAgICAgICAgICAgICAkJC0+bV90YWcgPSBRdWFsaWZpZWROYW1lKG51bGxBdG9tLCBzdGFy QXRvbSwgcC0+ZGVmYXVsdE5hbWVzcGFjZSk7CiAgICAgfQotICAgIHwgbmFtZXNwYWNlX3NlbGVj dG9yIGVsZW1lbnRfbmFtZSBtYXliZV9zcGFjZSB7CisgICAgfCBuYW1lc3BhY2Vfc2VsZWN0b3Ig ZWxlbWVudF9uYW1lIHsKICAgICAgICAgQXRvbWljU3RyaW5nIG5hbWVzcGFjZVByZWZpeCA9IGF0 b21pY1N0cmluZygkMSk7CiAgICAgICAgIENTU1BhcnNlciogcCA9IHN0YXRpY19jYXN0PENTU1Bh cnNlcio+KHBhcnNlcik7CiAgICAgICAgICQkID0gcC0+Y3JlYXRlRmxvYXRpbmdTZWxlY3Rvcigp OwpAQCAtNjcxLDcgKzY5Nyw3IEBAIHNpbXBsZV9zZWxlY3RvcjoKICAgICAgICAgZWxzZSAvLyBG SVhNRTogU2hvdWxkbid0IHRoaXMgY2FzZSBiZSBhbiBlcnJvcj8KICAgICAgICAgICAgICQkLT5t X3RhZyA9IFF1YWxpZmllZE5hbWUobnVsbEF0b20sIGF0b21pY1N0cmluZygkMiksIHAtPmRlZmF1 bHROYW1lc3BhY2UpOwogICAgIH0KLSAgICB8IG5hbWVzcGFjZV9zZWxlY3RvciBlbGVtZW50X25h bWUgc3BlY2lmaWVyX2xpc3QgbWF5YmVfc3BhY2UgeworICAgIHwgbmFtZXNwYWNlX3NlbGVjdG9y IGVsZW1lbnRfbmFtZSBzcGVjaWZpZXJfbGlzdCB7CiAgICAgICAgICQkID0gJDM7CiAgICAgICAg IGlmICgkJCkgewogICAgICAgICAgICAgQXRvbWljU3RyaW5nIG5hbWVzcGFjZVByZWZpeCA9IGF0 b21pY1N0cmluZygkMSk7CkBAIC02ODQsNyArNzEwLDcgQEAgc2ltcGxlX3NlbGVjdG9yOgogICAg ICAgICAgICAgICAgICQkLT5tX3RhZyA9IFF1YWxpZmllZE5hbWUobnVsbEF0b20sIGF0b21pY1N0 cmluZygkMiksIHAtPmRlZmF1bHROYW1lc3BhY2UpOwogICAgICAgICB9CiAgICAgfQotICAgIHwg bmFtZXNwYWNlX3NlbGVjdG9yIHNwZWNpZmllcl9saXN0IG1heWJlX3NwYWNlIHsKKyAgICB8IG5h bWVzcGFjZV9zZWxlY3RvciBzcGVjaWZpZXJfbGlzdCB7CiAgICAgICAgICQkID0gJDI7CiAgICAg ICAgIGlmICgkJCkgewogICAgICAgICAgICAgQXRvbWljU3RyaW5nIG5hbWVzcGFjZVByZWZpeCA9 IGF0b21pY1N0cmluZygkMSk7CkBAIC04NTYsOSArODgyLDcgQEAgcHNldWRvOgogICAgICAgICAg ICAgJCQgPSAwOwogICAgICAgICBlbHNlIGlmICh0eXBlID09IENTU1NlbGVjdG9yOjpQc2V1ZG9F bXB0eSB8fAogICAgICAgICAgICAgICAgICB0eXBlID09IENTU1NlbGVjdG9yOjpQc2V1ZG9GaXJz dENoaWxkIHx8Ci0gICAgICAgICAgICAgICAgIHR5cGUgPT0gQ1NTU2VsZWN0b3I6OlBzZXVkb0Zp cnN0T2ZUeXBlIHx8Ci0gICAgICAgICAgICAgICAgIHR5cGUgPT0gQ1NTU2VsZWN0b3I6OlBzZXVk b0xhc3RDaGlsZCB8fAotICAgICAgICAgICAgICAgICB0eXBlID09IENTU1NlbGVjdG9yOjpQc2V1 ZG9MYXN0T2ZUeXBlKSB7CisgICAgICAgICAgICAgICAgIHR5cGUgPT0gQ1NTU2VsZWN0b3I6OlBz ZXVkb0ZpcnN0T2ZUeXBlKSB7CiAgICAgICAgICAgICBDU1NQYXJzZXIqIHAgPSBzdGF0aWNfY2Fz dDxDU1NQYXJzZXIqPihwYXJzZXIpOwogICAgICAgICAgICAgRG9jdW1lbnQqIGRvYyA9IHAtPmRv Y3VtZW50KCk7CiAgICAgICAgICAgICBpZiAoZG9jKQpAQCAtODk0LDcgKzkxOCw3IEBAIHBzZXVk bzoKICAgICAgICAgICAgICQkID0gMDsKICAgICB9CiAgICAgLy8gdXNlZCBieSA6bm90Ci0gICAg fCAnOicgTk9URlVOQ1RJT04gbWF5YmVfc3BhY2Ugc2ltcGxlX3NlbGVjdG9yICcpJyB7CisgICAg fCAnOicgTk9URlVOQ1RJT04gbWF5YmVfc3BhY2Ugc2ltcGxlX3NlbGVjdG9yIG1heWJlX3NwYWNl ICcpJyB7CiAgICAgICAgIGlmICghJDQpCiAgICAgICAgICAgICAkJCA9IDA7CiAgICAgICAgIGVs c2Ugewo=