31301 2009-11-10 09:24:47 -0800 [V8] Fix crash in V8CustomXPathNSResolver (http://crbug.com/26726). 2009-11-10 18:15:33 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 31200 1 vitalyr webkit-unassigned commit-queue dglazkov eric oldest_to_newest 162068 0 vitalyr 2009-11-10 09:24:47 -0800 [V8] Fix crash in V8CustomXPathNSResolver (http://crbug.com/26726). 162086 1 42874 vitalyr 2009-11-10 10:19:47 -0800 Created attachment 42874 patch:layout test and fix 162091 2 42874 dglazkov 2009-11-10 10:26:05 -0800 Comment on attachment 42874 patch:layout test and fix > // XPath-related utilities > - static RefPtr<XPathNSResolver> getXPathNSResolver(v8::Handle<v8::Value> value) > + static RefPtr<XPathNSResolver> getXPathNSResolver(v8::Handle<v8::Value> value, V8Proxy* proxy=0) proxy = 0 otherwise, r=me. 162093 3 42875 vitalyr 2009-11-10 10:30:19 -0800 Created attachment 42875 patch: layout test and fix v2 162094 4 vitalyr 2009-11-10 10:30:36 -0800 (In reply to comment #2) > (From update of attachment 42874 [details]) > > // XPath-related utilities > > - static RefPtr<XPathNSResolver> getXPathNSResolver(v8::Handle<v8::Value> value) > > + static RefPtr<XPathNSResolver> getXPathNSResolver(v8::Handle<v8::Value> value, V8Proxy* proxy=0) > > proxy = 0 > > otherwise, r=me. Done. Thanks. 162098 5 42875 dglazkov 2009-11-10 10:34:29 -0800 Comment on attachment 42875 patch: layout test and fix v2 r=me. Hope the test expectations aren't generated on Chromium, like the last time ;) 162104 6 42875 commit-queue 2009-11-10 10:41:28 -0800 Comment on attachment 42875 patch: layout test and fix v2 Rejecting patch 42875 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--quiet', '--exit-after-n-failures=1']" exit_code: 1 Running build-dumprendertree Running tests from /Users/eseidel/Projects/CommitQueue/LayoutTests Testing 11584 test cases. http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe.html -> failed Exiting early after 1 failures. 9001 tests run. 251.94s total testing time 9000 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 5 test cases (<1%) had stderr output 162106 7 42875 dglazkov 2009-11-10 10:50:17 -0800 Comment on attachment 42875 patch: layout test and fix v2 spin again. 162113 8 eric 2009-11-10 10:57:08 -0800 I've filed bug 31305 about the failure. You should feel encouraged to file bugs about mysterious cq failures if you ever see them. 162134 9 42875 commit-queue 2009-11-10 11:29:47 -0800 Comment on attachment 42875 patch: layout test and fix v2 Rejecting patch 42875 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--quiet', '--exit-after-n-failures=1']" exit_code: 1 Running build-dumprendertree Running tests from /Users/eseidel/Projects/CommitQueue/LayoutTests Testing 11584 test cases. http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe.html -> failed Exiting early after 1 failures. 9001 tests run. 246.13s total testing time 9000 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 5 test cases (<1%) had stderr output 162307 10 42875 commit-queue 2009-11-10 18:15:27 -0800 Comment on attachment 42875 patch: layout test and fix v2 Clearing flags on attachment: 42875 Committed r50785: <http://trac.webkit.org/changeset/50785> 162308 11 commit-queue 2009-11-10 18:15:33 -0800 All reviewed patches have been landed. Closing bug. 42874 2009-11-10 10:19:47 -0800 2009-11-10 10:30:19 -0800 patch:layout test and fix fix_xpath.patch text/plain 9189 vitalyr ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5OWIxNjk5Li4zY2UwOTYyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEt MTAgIFZpdGFseSBSZXBlc2hrbyAgPHZpdGFseXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtWOF0gRml4IGNyYXNoIGluIFY4 Q3VzdG9tWFBhdGhOU1Jlc29sdmVyIChodHRwOi8vY3JidWcuY29tLzI2NzI2KS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMzAxCisKKyAgICAgICAg KiBmYXN0L3hwYXRoL3hwYXRoLWRldGFjaGVkLWlmcmFtZS1yZXNvbHZlci1jcmFzaC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QveHBhdGgveHBhdGgtZGV0YWNoZWQtaWZyYW1l LXJlc29sdmVyLWNyYXNoLmh0bWw6IEFkZGVkLgorCiAyMDA5LTExLTAzICBTaGluaWNoaXJvIEhh bWFqaSAgPGhhbWFqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3hwYXRoL3hwYXRoLWRldGFjaGVk LWlmcmFtZS1yZXNvbHZlci1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3hw YXRoL3hwYXRoLWRldGFjaGVkLWlmcmFtZS1yZXNvbHZlci1jcmFzaC1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uY2E4YjEzNgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgtZGV0YWNoZWQtaWZyYW1lLXJlc29sdmVy LWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDYgQEAKK0Vuc3VyZSB0aGF0IHVzaW5nIFhQ YXRoIG5hbWVzcGFjZSByZXNvbHZlciB3aXRoIGEgZGV0YWNoZWQgaWZyYW1lIGRvZXNuJ3QgY3Jh c2guCisKK1BBU1MgRGlkIG5vdCBjcmFzaC4KK1BBU1MgZHVtbXlSZXNvbHZlckNhbGxlZCBpcyB0 cnVlCitQQVNTIGZvdW5kTm9kZS50b1N0cmluZygpIGlzICJbb2JqZWN0IEhUTUxEaXZFbGVtZW50 XSIKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC94cGF0aC94cGF0aC1kZXRhY2hlZC1p ZnJhbWUtcmVzb2x2ZXItY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgt ZGV0YWNoZWQtaWZyYW1lLXJlc29sdmVyLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMC4uYzNlODFhMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QveHBhdGgveHBhdGgtZGV0YWNoZWQtaWZyYW1lLXJlc29sdmVyLWNyYXNoLmh0bWwKQEAgLTAs MCArMSw0MSBAQAorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0i Li4vanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi9qcy9y ZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKyAgICBpZiAod2lu ZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVy LndhaXRVbnRpbERvbmUoKTsKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4 dCgpOworICAgIH0KKworICAgIHZhciBkdW1teVJlc29sdmVyQ2FsbGVkID0gZmFsc2U7CisgICAg dmFyIGZvdW5kTm9kZTsKKyAgICBmdW5jdGlvbiBkdW1teVJlc29sdmVyKCkgeworICAgICAgICBk dW1teVJlc29sdmVyQ2FsbGVkID0gdHJ1ZTsKKyAgICAgICAgcmV0dXJuICJodHRwOi8vd3d3Lncz Lm9yZy8xOTk5L3hodG1sIjsKKyAgICB9CisKKyAgICBmdW5jdGlvbiB0ZXN0KCkgeworICAgICAg ICB2YXIgaWZyYW1lID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaWZyYW1lIik7CisgICAgICAg IGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoaWZyYW1lKTsKKyAgICAgICAgdmFyIGRvYyA9IGlm cmFtZS5jb250ZW50V2luZG93LmRvY3VtZW50OworICAgICAgICBkb2Mub3BlbigpOworICAgICAg ICBkb2Mud3JpdGUoIjxodG1sPjxib2R5PjxkaXY+PC9kaXY+PC9ib2R5PjwvaHRtbD4iKTsKKyAg ICAgICAgZG9jLmNsb3NlKCk7CisgICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoaWZy YW1lKTsKKyAgICAgICAgZm91bmROb2RlID0gZG9jLmV2YWx1YXRlKCIvL2R1bW15bnM6ZGl2Iiwg ZG9jLCBkdW1teVJlc29sdmVyLCBYUGF0aFJlc3VsdC5GSVJTVF9PUkRFUkVEX05PREVfVFlQRSwg bnVsbCkuc2luZ2xlTm9kZVZhbHVlOworCisgICAgICAgIHRlc3RQYXNzZWQoIkRpZCBub3QgY3Jh c2guIik7CisgICAgICAgIHNob3VsZEJlVHJ1ZSgiZHVtbXlSZXNvbHZlckNhbGxlZCIpOworICAg ICAgICBzaG91bGRCZSgiZm91bmROb2RlLnRvU3RyaW5nKCkiLCAiXCJbb2JqZWN0IEhUTUxEaXZF bGVtZW50XVwiIik7CisKKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikK KyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKKyAgICB9Cis8 L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0idGVzdCgpIj4KKzxwPkVuc3VyZSB0aGF0 IHVzaW5nIFhQYXRoIG5hbWVzcGFjZSByZXNvbHZlciB3aXRoIGEgZGV0YWNoZWQgaWZyYW1lIGRv ZXNuJ3QgY3Jhc2guPC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8L2JvZHk+Cis8L2h0 bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDMwZThmYzYuLmUzZDYyM2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMTEtMTAgIFZpdGFseSBS ZXBlc2hrbyAgPHZpdGFseXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtWOF0gRml4IGNyYXNoIGluIFY4Q3VzdG9tWFBhdGhO U1Jlc29sdmVyIChodHRwOi8vY3JidWcuY29tLzI2NzI2KS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMzAxCisKKyAgICAgICAgVGVzdGVkIGJ5IG5l dyBmYXN0L3hwYXRoL3hwYXRoLWRldGFjaGVkLWlmcmFtZS1yZXNvbHZlci1jcmFzaC5odG1sLgor CisgICAgICAgIEFsbG93ZWQgcGFzc2luZyBWOFByb3h5IGZvciB0aGUgY2FsbGluZyBKUyBjb250 ZXh0OgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5oOgorICAgICAgICAoV2Vi Q29yZTo6VjhET01XcmFwcGVyOjpnZXRYUGF0aE5TUmVzb2x2ZXIpOgorICAgICAgICAqIGJpbmRp bmdzL3Y4L2N1c3RvbS9WOEN1c3RvbVhQYXRoTlNSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OlY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyOjpWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcik6CisgICAg ICAgIChXZWJDb3JlOjpWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcjo6bG9va3VwTmFtZXNwYWNlVVJJ KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIu aDoKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhEb2N1bWVudEN1c3RvbS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDQUxMQkFDS19GVU5DX0RFQ0wpOgorCiAyMDA5LTExLTA5ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmgg Yi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5oCmluZGV4IDFiZmZjMTEuLjM1ZDE2 ZmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmgKKysrIGIv V2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuaApAQCAtMjUzLDEzICsyNTMsMTMgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogCiAKICAgICAgICAgLy8gWFBhdGgtcmVsYXRlZCB1dGlsaXRp ZXMKLSAgICAgICAgc3RhdGljIFJlZlB0cjxYUGF0aE5TUmVzb2x2ZXI+IGdldFhQYXRoTlNSZXNv bHZlcih2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUpCisgICAgICAgIHN0YXRpYyBSZWZQdHI8 WFBhdGhOU1Jlc29sdmVyPiBnZXRYUGF0aE5TUmVzb2x2ZXIodjg6OkhhbmRsZTx2ODo6VmFsdWU+ IHZhbHVlLCBWOFByb3h5KiBwcm94eT0wKQogICAgICAgICB7CiAgICAgICAgICAgICBSZWZQdHI8 WFBhdGhOU1Jlc29sdmVyPiByZXNvbHZlcjsKICAgICAgICAgICAgIGlmIChWOFhQYXRoTlNSZXNv bHZlcjo6SGFzSW5zdGFuY2UodmFsdWUpKQogICAgICAgICAgICAgICAgIHJlc29sdmVyID0gY29u dmVydFRvTmF0aXZlT2JqZWN0PFhQYXRoTlNSZXNvbHZlcj4oVjhDbGFzc0luZGV4OjpYUEFUSE5T UkVTT0xWRVIsIHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QodmFsdWUpKTsKICAgICAgICAg ICAgIGVsc2UgaWYgKHZhbHVlLT5Jc09iamVjdCgpKQotICAgICAgICAgICAgICAgIHJlc29sdmVy ID0gVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXI6OmNyZWF0ZSh2YWx1ZS0+VG9PYmplY3QoKSk7Cisg ICAgICAgICAgICAgICAgcmVzb2x2ZXIgPSBWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcjo6Y3JlYXRl KHByb3h5LCB2YWx1ZS0+VG9PYmplY3QoKSk7CiAgICAgICAgICAgICByZXR1cm4gcmVzb2x2ZXI7 CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhD dXN0b21YUGF0aE5TUmVzb2x2ZXIuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhD dXN0b21YUGF0aE5TUmVzb2x2ZXIuY3BwCmluZGV4IDMzNDE5MjQuLmU0NWNiYTAgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyLmNw cAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbVhQYXRoTlNSZXNvbHZl ci5jcHAKQEAgLTM4LDEzICszOCwxNCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVBhc3NS ZWZQdHI8VjhDdXN0b21YUGF0aE5TUmVzb2x2ZXI+IFY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyOjpj cmVhdGUodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiByZXNvbHZlcikKK1Bhc3NSZWZQdHI8VjhDdXN0 b21YUGF0aE5TUmVzb2x2ZXI+IFY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyOjpjcmVhdGUoVjhQcm94 eSogcHJveHksIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gcmVzb2x2ZXIpCiB7Ci0gICAgcmV0dXJu IGFkb3B0UmVmKG5ldyBWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcihyZXNvbHZlcikpOworICAgIHJl dHVybiBhZG9wdFJlZihuZXcgVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIocHJveHksIHJlc29sdmVy KSk7CiB9CiAKLVY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyOjpWOEN1c3RvbVhQYXRoTlNSZXNvbHZl cih2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHJlc29sdmVyKQotICAgIDogbV9yZXNvbHZlcihyZXNv bHZlcikKK1Y4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyOjpWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcihW OFByb3h5KiBwcm94eSwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiByZXNvbHZlcikKKyAgICAgICAg OiBtX3Byb3h5KHByb3h5KQorICAgICAgICAsIG1fcmVzb2x2ZXIocmVzb2x2ZXIpCiB7CiB9CiAK QEAgLTU0LDYgKzU1LDE0IEBAIFY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyOjp+VjhDdXN0b21YUGF0 aE5TUmVzb2x2ZXIoKQogCiBTdHJpbmcgVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXI6Omxvb2t1cE5h bWVzcGFjZVVSSShjb25zdCBTdHJpbmcmIHByZWZpeCkKIHsKKyAgICBWOFByb3h5KiBwcm94eSA9 IG1fcHJveHk7CisKKyAgICBpZiAoIXByb3h5KSB7CisgICAgICAgIHByb3h5ID0gVjhQcm94eTo6 cmV0cmlldmUoKTsKKyAgICAgICAgaWYgKCFwcm94eSkKKyAgICAgICAgICAgIHJldHVybiBTdHJp bmcoKTsKKyAgICB9CisKICAgICB2ODo6SGFuZGxlPHY4OjpGdW5jdGlvbj4gbG9va3VwTmFtZXNw YWNlVVJJRnVuYzsKICAgICB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGxvb2t1cE5hbWVzcGFjZVVS SU5hbWUgPSB2ODo6U3RyaW5nOjpOZXcoImxvb2t1cE5hbWVzcGFjZVVSSSIpOwogCkBAIC02NSw3 ICs3NCw3IEBAIFN0cmluZyBWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcjo6bG9va3VwTmFtZXNwYWNl VVJJKGNvbnN0IFN0cmluZyYgcHJlZml4KQogICAgIH0KIAogICAgIGlmIChsb29rdXBOYW1lc3Bh Y2VVUklGdW5jLklzRW1wdHkoKSAmJiAhbV9yZXNvbHZlci0+SXNGdW5jdGlvbigpKSB7Ci0gICAg ICAgIEZyYW1lKiBmcmFtZSA9IFY4UHJveHk6OnJldHJpZXZlRnJhbWVGb3JFbnRlcmVkQ29udGV4 dCgpOworICAgICAgICBGcmFtZSogZnJhbWUgPSBwcm94eS0+ZnJhbWUoKTsKICAgICAgICAgbG9n SW5mbyhmcmFtZSwgIlhQYXRoTlNSZXNvbHZlciBkb2VzIG5vdCBoYXZlIGEgbG9va3VwTmFtZXNw YWNlVVJJIG1ldGhvZC4iLCBTdHJpbmcoKSk7CiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKICAg ICB9CkBAIC03OCw3ICs4Nyw2IEBAIFN0cmluZyBWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcjo6bG9v a3VwTmFtZXNwYWNlVVJJKGNvbnN0IFN0cmluZyYgcHJlZml4KQogICAgIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiBhcmd2W2FyZ2NdID0geyB2OFN0cmluZyhwcmVmaXgpIH07CiAgICAgdjg6OkhhbmRs ZTx2ODo6RnVuY3Rpb24+IGZ1bmN0aW9uID0gbG9va3VwTmFtZXNwYWNlVVJJRnVuYy5Jc0VtcHR5 KCkgPyB2ODo6SGFuZGxlPHY4OjpGdW5jdGlvbj46OkNhc3QobV9yZXNvbHZlcikgOiBsb29rdXBO YW1lc3BhY2VVUklGdW5jOwogCi0gICAgVjhQcm94eSogcHJveHkgPSBWOFByb3h5OjpyZXRyaWV2 ZSgpOwogICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiByZXR2YWwgPSBwcm94eS0+Y2FsbEZ1bmN0 aW9uKGZ1bmN0aW9uLCBtX3Jlc29sdmVyLCBhcmdjLCBhcmd2KTsKIAogICAgIC8vIEVhdCBleGNl cHRpb25zIGZyb20gbmFtZXNwYWNlIHJlc29sdmVyIGFuZCByZXR1cm4gYW4gZW1wdHkgc3RyaW5n LiBUaGlzIHdpbGwgbW9zdCBsaWtlbHkgY2F1c2UgTkFNRVNQQUNFX0VSUi4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyLmggYi9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbVhQYXRoTlNSZXNvbHZlci5oCmluZGV4 IGYxZGM2NWMuLjE1YWMyN2QgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIuaApAQCAtNDIsMTcgKzQyLDIyIEBACiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIGNsYXNzIFN0cmluZzsKK2NsYXNzIFY4UHJveHk7CiAKKy8vIFY4Q3Vz dG9tWFBhdGhOU1Jlc29sdmVyIGRvZXMgbm90IGNyZWF0ZSBhIHBlcnNpc3RlbnQgaGFuZGxlIHRv IHRoZQorLy8gZ2l2ZW4gcmVzb2x2ZXIgb2JqZWN0LiAgU28gdGhlIGxpZmV0aW1lIG9mIFY4Q3Vz dG9tWFBhdGhOU1Jlc29sdmVyCisvLyBtdXN0IG5vdCBleGNlZWQgdGhlIGxpZmV0aW1lIG9mIHRo ZSBwYXNzZWQgaGFuZGxlLgogY2xhc3MgVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIgOiBwdWJsaWMg WFBhdGhOU1Jlc29sdmVyIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxWOEN1c3Rv bVhQYXRoTlNSZXNvbHZlcj4gY3JlYXRlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gcmVzb2x2ZXIp OworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyPiBjcmVhdGUo VjhQcm94eSogcHJveHksIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gcmVzb2x2ZXIpOwogCiAgICAg dmlydHVhbCB+VjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIoKTsKICAgICB2aXJ0dWFsIFN0cmluZyBs b29rdXBOYW1lc3BhY2VVUkkoY29uc3QgU3RyaW5nJiBwcmVmaXgpOwogCiBwcml2YXRlOgotICAg IFY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gcmVzb2x2ZXIp OworICAgIFY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyKFY4UHJveHkqIHByb3h5LCB2ODo6SGFuZGxl PHY4OjpPYmplY3Q+IHJlc29sdmVyKTsKIAorICAgIFY4UHJveHkqIG1fcHJveHk7CiAgICAgdjg6 OkhhbmRsZTx2ODo6T2JqZWN0PiBtX3Jlc29sdmVyOyAgLy8gSGFuZGxlIHRvIHJlc29sdmVyIG9i amVjdC4KIH07CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RG9j dW1lbnRDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEb2N1bWVudEN1 c3RvbS5jcHAKaW5kZXggZjkyMWE4MC4uNjE3NzU5MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhEb2N1bWVudEN1c3RvbS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5n cy92OC9jdXN0b20vVjhEb2N1bWVudEN1c3RvbS5jcHAKQEAgLTYxLDcgKzYxLDcgQEAgQ0FMTEJB Q0tfRlVOQ19ERUNMKERvY3VtZW50RXZhbHVhdGUpCiAgICAgaWYgKFY4Tm9kZTo6SGFzSW5zdGFu Y2UoYXJnc1sxXSkpCiAgICAgICAgIGNvbnRleHROb2RlID0gVjhET01XcmFwcGVyOjpjb252ZXJ0 RE9NV3JhcHBlclRvTm9kZTxOb2RlPih2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KGFyZ3Nb MV0pKTsKIAotICAgIFJlZlB0cjxYUGF0aE5TUmVzb2x2ZXI+IHJlc29sdmVyID0gVjhET01XcmFw cGVyOjpnZXRYUGF0aE5TUmVzb2x2ZXIoYXJnc1syXSk7CisgICAgUmVmUHRyPFhQYXRoTlNSZXNv bHZlcj4gcmVzb2x2ZXIgPSBWOERPTVdyYXBwZXI6OmdldFhQYXRoTlNSZXNvbHZlcihhcmdzWzJd LCBWOFByb3h5OjpyZXRyaWV2ZShWOFByb3h5OjpyZXRyaWV2ZUZyYW1lRm9yQ2FsbGluZ0NvbnRl eHQoKSkpOwogICAgIGlmICghcmVzb2x2ZXIgJiYgIWFyZ3NbMl0tPklzTnVsbCgpICYmICFhcmdz WzJdLT5Jc1VuZGVmaW5lZCgpKQogICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihUWVBFX01JU01B VENIX0VSUik7CiAK 42875 2009-11-10 10:30:19 -0800 2009-11-10 18:15:27 -0800 patch: layout test and fix v2 fix_xpath.patch text/plain 9191 vitalyr ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5OWIxNjk5Li4zY2UwOTYyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEt MTAgIFZpdGFseSBSZXBlc2hrbyAgPHZpdGFseXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtWOF0gRml4IGNyYXNoIGluIFY4 Q3VzdG9tWFBhdGhOU1Jlc29sdmVyIChodHRwOi8vY3JidWcuY29tLzI2NzI2KS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMzAxCisKKyAgICAgICAg KiBmYXN0L3hwYXRoL3hwYXRoLWRldGFjaGVkLWlmcmFtZS1yZXNvbHZlci1jcmFzaC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QveHBhdGgveHBhdGgtZGV0YWNoZWQtaWZyYW1l LXJlc29sdmVyLWNyYXNoLmh0bWw6IEFkZGVkLgorCiAyMDA5LTExLTAzICBTaGluaWNoaXJvIEhh bWFqaSAgPGhhbWFqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3hwYXRoL3hwYXRoLWRldGFjaGVk LWlmcmFtZS1yZXNvbHZlci1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3hw YXRoL3hwYXRoLWRldGFjaGVkLWlmcmFtZS1yZXNvbHZlci1jcmFzaC1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uY2E4YjEzNgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgtZGV0YWNoZWQtaWZyYW1lLXJlc29sdmVy LWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDYgQEAKK0Vuc3VyZSB0aGF0IHVzaW5nIFhQ YXRoIG5hbWVzcGFjZSByZXNvbHZlciB3aXRoIGEgZGV0YWNoZWQgaWZyYW1lIGRvZXNuJ3QgY3Jh c2guCisKK1BBU1MgRGlkIG5vdCBjcmFzaC4KK1BBU1MgZHVtbXlSZXNvbHZlckNhbGxlZCBpcyB0 cnVlCitQQVNTIGZvdW5kTm9kZS50b1N0cmluZygpIGlzICJbb2JqZWN0IEhUTUxEaXZFbGVtZW50 XSIKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC94cGF0aC94cGF0aC1kZXRhY2hlZC1p ZnJhbWUtcmVzb2x2ZXItY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QveHBhdGgveHBhdGgt ZGV0YWNoZWQtaWZyYW1lLXJlc29sdmVyLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMC4uYzNlODFhMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QveHBhdGgveHBhdGgtZGV0YWNoZWQtaWZyYW1lLXJlc29sdmVyLWNyYXNoLmh0bWwKQEAgLTAs MCArMSw0MSBAQAorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0i Li4vanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi9qcy9y ZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKyAgICBpZiAod2lu ZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVy LndhaXRVbnRpbERvbmUoKTsKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4 dCgpOworICAgIH0KKworICAgIHZhciBkdW1teVJlc29sdmVyQ2FsbGVkID0gZmFsc2U7CisgICAg dmFyIGZvdW5kTm9kZTsKKyAgICBmdW5jdGlvbiBkdW1teVJlc29sdmVyKCkgeworICAgICAgICBk dW1teVJlc29sdmVyQ2FsbGVkID0gdHJ1ZTsKKyAgICAgICAgcmV0dXJuICJodHRwOi8vd3d3Lncz Lm9yZy8xOTk5L3hodG1sIjsKKyAgICB9CisKKyAgICBmdW5jdGlvbiB0ZXN0KCkgeworICAgICAg ICB2YXIgaWZyYW1lID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaWZyYW1lIik7CisgICAgICAg IGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoaWZyYW1lKTsKKyAgICAgICAgdmFyIGRvYyA9IGlm cmFtZS5jb250ZW50V2luZG93LmRvY3VtZW50OworICAgICAgICBkb2Mub3BlbigpOworICAgICAg ICBkb2Mud3JpdGUoIjxodG1sPjxib2R5PjxkaXY+PC9kaXY+PC9ib2R5PjwvaHRtbD4iKTsKKyAg ICAgICAgZG9jLmNsb3NlKCk7CisgICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoaWZy YW1lKTsKKyAgICAgICAgZm91bmROb2RlID0gZG9jLmV2YWx1YXRlKCIvL2R1bW15bnM6ZGl2Iiwg ZG9jLCBkdW1teVJlc29sdmVyLCBYUGF0aFJlc3VsdC5GSVJTVF9PUkRFUkVEX05PREVfVFlQRSwg bnVsbCkuc2luZ2xlTm9kZVZhbHVlOworCisgICAgICAgIHRlc3RQYXNzZWQoIkRpZCBub3QgY3Jh c2guIik7CisgICAgICAgIHNob3VsZEJlVHJ1ZSgiZHVtbXlSZXNvbHZlckNhbGxlZCIpOworICAg ICAgICBzaG91bGRCZSgiZm91bmROb2RlLnRvU3RyaW5nKCkiLCAiXCJbb2JqZWN0IEhUTUxEaXZF bGVtZW50XVwiIik7CisKKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikK KyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKKyAgICB9Cis8 L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0idGVzdCgpIj4KKzxwPkVuc3VyZSB0aGF0 IHVzaW5nIFhQYXRoIG5hbWVzcGFjZSByZXNvbHZlciB3aXRoIGEgZGV0YWNoZWQgaWZyYW1lIGRv ZXNuJ3QgY3Jhc2guPC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8L2JvZHk+Cis8L2h0 bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDMwZThmYzYuLmUzZDYyM2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMTEtMTAgIFZpdGFseSBS ZXBlc2hrbyAgPHZpdGFseXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtWOF0gRml4IGNyYXNoIGluIFY4Q3VzdG9tWFBhdGhO U1Jlc29sdmVyIChodHRwOi8vY3JidWcuY29tLzI2NzI2KS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMzAxCisKKyAgICAgICAgVGVzdGVkIGJ5IG5l dyBmYXN0L3hwYXRoL3hwYXRoLWRldGFjaGVkLWlmcmFtZS1yZXNvbHZlci1jcmFzaC5odG1sLgor CisgICAgICAgIEFsbG93ZWQgcGFzc2luZyBWOFByb3h5IGZvciB0aGUgY2FsbGluZyBKUyBjb250 ZXh0OgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5oOgorICAgICAgICAoV2Vi Q29yZTo6VjhET01XcmFwcGVyOjpnZXRYUGF0aE5TUmVzb2x2ZXIpOgorICAgICAgICAqIGJpbmRp bmdzL3Y4L2N1c3RvbS9WOEN1c3RvbVhQYXRoTlNSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OlY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyOjpWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcik6CisgICAg ICAgIChXZWJDb3JlOjpWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcjo6bG9va3VwTmFtZXNwYWNlVVJJ KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIu aDoKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhEb2N1bWVudEN1c3RvbS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDQUxMQkFDS19GVU5DX0RFQ0wpOgorCiAyMDA5LTExLTA5ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmgg Yi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5oCmluZGV4IDFiZmZjMTEuLjliYTg4 OGYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmgKKysrIGIv V2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuaApAQCAtMjUzLDEzICsyNTMsMTMgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogCiAKICAgICAgICAgLy8gWFBhdGgtcmVsYXRlZCB1dGlsaXRp ZXMKLSAgICAgICAgc3RhdGljIFJlZlB0cjxYUGF0aE5TUmVzb2x2ZXI+IGdldFhQYXRoTlNSZXNv bHZlcih2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUpCisgICAgICAgIHN0YXRpYyBSZWZQdHI8 WFBhdGhOU1Jlc29sdmVyPiBnZXRYUGF0aE5TUmVzb2x2ZXIodjg6OkhhbmRsZTx2ODo6VmFsdWU+ IHZhbHVlLCBWOFByb3h5KiBwcm94eSA9IDApCiAgICAgICAgIHsKICAgICAgICAgICAgIFJlZlB0 cjxYUGF0aE5TUmVzb2x2ZXI+IHJlc29sdmVyOwogICAgICAgICAgICAgaWYgKFY4WFBhdGhOU1Jl c29sdmVyOjpIYXNJbnN0YW5jZSh2YWx1ZSkpCiAgICAgICAgICAgICAgICAgcmVzb2x2ZXIgPSBj b252ZXJ0VG9OYXRpdmVPYmplY3Q8WFBhdGhOU1Jlc29sdmVyPihWOENsYXNzSW5kZXg6OlhQQVRI TlNSRVNPTFZFUiwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdCh2YWx1ZSkpOwogICAgICAg ICAgICAgZWxzZSBpZiAodmFsdWUtPklzT2JqZWN0KCkpCi0gICAgICAgICAgICAgICAgcmVzb2x2 ZXIgPSBWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcjo6Y3JlYXRlKHZhbHVlLT5Ub09iamVjdCgpKTsK KyAgICAgICAgICAgICAgICByZXNvbHZlciA9IFY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyOjpjcmVh dGUocHJveHksIHZhbHVlLT5Ub09iamVjdCgpKTsKICAgICAgICAgICAgIHJldHVybiByZXNvbHZl cjsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OEN1c3RvbVhQYXRoTlNSZXNvbHZlci5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OEN1c3RvbVhQYXRoTlNSZXNvbHZlci5jcHAKaW5kZXggMzM0MTkyNC4uZTQ1Y2JhMCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIu Y3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tWFBhdGhOU1Jlc29s dmVyLmNwcApAQCAtMzgsMTMgKzM4LDE0IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUGFz c1JlZlB0cjxWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcj4gVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXI6 OmNyZWF0ZSh2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHJlc29sdmVyKQorUGFzc1JlZlB0cjxWOEN1 c3RvbVhQYXRoTlNSZXNvbHZlcj4gVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXI6OmNyZWF0ZShWOFBy b3h5KiBwcm94eSwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiByZXNvbHZlcikKIHsKLSAgICByZXR1 cm4gYWRvcHRSZWYobmV3IFY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyKHJlc29sdmVyKSk7CisgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcihwcm94eSwgcmVzb2x2 ZXIpKTsKIH0KIAotVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXI6OlY4Q3VzdG9tWFBhdGhOU1Jlc29s dmVyKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gcmVzb2x2ZXIpCi0gICAgOiBtX3Jlc29sdmVyKHJl c29sdmVyKQorVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXI6OlY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVy KFY4UHJveHkqIHByb3h5LCB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHJlc29sdmVyKQorICAgICAg ICA6IG1fcHJveHkocHJveHkpCisgICAgICAgICwgbV9yZXNvbHZlcihyZXNvbHZlcikKIHsKIH0K IApAQCAtNTQsNiArNTUsMTQgQEAgVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXI6On5WOEN1c3RvbVhQ YXRoTlNSZXNvbHZlcigpCiAKIFN0cmluZyBWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcjo6bG9va3Vw TmFtZXNwYWNlVVJJKGNvbnN0IFN0cmluZyYgcHJlZml4KQogeworICAgIFY4UHJveHkqIHByb3h5 ID0gbV9wcm94eTsKKworICAgIGlmICghcHJveHkpIHsKKyAgICAgICAgcHJveHkgPSBWOFByb3h5 OjpyZXRyaWV2ZSgpOworICAgICAgICBpZiAoIXByb3h5KQorICAgICAgICAgICAgcmV0dXJuIFN0 cmluZygpOworICAgIH0KKwogICAgIHY4OjpIYW5kbGU8djg6OkZ1bmN0aW9uPiBsb29rdXBOYW1l c3BhY2VVUklGdW5jOwogICAgIHY4OjpIYW5kbGU8djg6OlN0cmluZz4gbG9va3VwTmFtZXNwYWNl VVJJTmFtZSA9IHY4OjpTdHJpbmc6Ok5ldygibG9va3VwTmFtZXNwYWNlVVJJIik7CiAKQEAgLTY1 LDcgKzc0LDcgQEAgU3RyaW5nIFY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyOjpsb29rdXBOYW1lc3Bh Y2VVUkkoY29uc3QgU3RyaW5nJiBwcmVmaXgpCiAgICAgfQogCiAgICAgaWYgKGxvb2t1cE5hbWVz cGFjZVVSSUZ1bmMuSXNFbXB0eSgpICYmICFtX3Jlc29sdmVyLT5Jc0Z1bmN0aW9uKCkpIHsKLSAg ICAgICAgRnJhbWUqIGZyYW1lID0gVjhQcm94eTo6cmV0cmlldmVGcmFtZUZvckVudGVyZWRDb250 ZXh0KCk7CisgICAgICAgIEZyYW1lKiBmcmFtZSA9IHByb3h5LT5mcmFtZSgpOwogICAgICAgICBs b2dJbmZvKGZyYW1lLCAiWFBhdGhOU1Jlc29sdmVyIGRvZXMgbm90IGhhdmUgYSBsb29rdXBOYW1l c3BhY2VVUkkgbWV0aG9kLiIsIFN0cmluZygpKTsKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwog ICAgIH0KQEAgLTc4LDcgKzg3LDYgQEAgU3RyaW5nIFY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyOjps b29rdXBOYW1lc3BhY2VVUkkoY29uc3QgU3RyaW5nJiBwcmVmaXgpCiAgICAgdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IGFyZ3ZbYXJnY10gPSB7IHY4U3RyaW5nKHByZWZpeCkgfTsKICAgICB2ODo6SGFu ZGxlPHY4OjpGdW5jdGlvbj4gZnVuY3Rpb24gPSBsb29rdXBOYW1lc3BhY2VVUklGdW5jLklzRW1w dHkoKSA/IHY4OjpIYW5kbGU8djg6OkZ1bmN0aW9uPjo6Q2FzdChtX3Jlc29sdmVyKSA6IGxvb2t1 cE5hbWVzcGFjZVVSSUZ1bmM7CiAKLSAgICBWOFByb3h5KiBwcm94eSA9IFY4UHJveHk6OnJldHJp ZXZlKCk7CiAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHJldHZhbCA9IHByb3h5LT5jYWxsRnVu Y3Rpb24oZnVuY3Rpb24sIG1fcmVzb2x2ZXIsIGFyZ2MsIGFyZ3YpOwogCiAgICAgLy8gRWF0IGV4 Y2VwdGlvbnMgZnJvbSBuYW1lc3BhY2UgcmVzb2x2ZXIgYW5kIHJldHVybiBhbiBlbXB0eSBzdHJp bmcuIFRoaXMgd2lsbCBtb3N0IGxpa2VseSBjYXVzZSBOQU1FU1BBQ0VfRVJSLgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIuaCBi L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyLmgKaW5k ZXggZjFkYzY1Yy4uMTVhYzI3ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIuaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOEN1c3RvbVhQYXRoTlNSZXNvbHZlci5oCkBAIC00MiwxNyArNDIsMjIgQEAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgU3RyaW5nOworY2xhc3MgVjhQcm94eTsKIAorLy8gVjhD dXN0b21YUGF0aE5TUmVzb2x2ZXIgZG9lcyBub3QgY3JlYXRlIGEgcGVyc2lzdGVudCBoYW5kbGUg dG8gdGhlCisvLyBnaXZlbiByZXNvbHZlciBvYmplY3QuICBTbyB0aGUgbGlmZXRpbWUgb2YgVjhD dXN0b21YUGF0aE5TUmVzb2x2ZXIKKy8vIG11c3Qgbm90IGV4Y2VlZCB0aGUgbGlmZXRpbWUgb2Yg dGhlIHBhc3NlZCBoYW5kbGUuCiBjbGFzcyBWOEN1c3RvbVhQYXRoTlNSZXNvbHZlciA6IHB1Ymxp YyBYUGF0aE5TUmVzb2x2ZXIgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFY4Q3Vz dG9tWFBhdGhOU1Jlc29sdmVyPiBjcmVhdGUodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiByZXNvbHZl cik7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8VjhDdXN0b21YUGF0aE5TUmVzb2x2ZXI+IGNyZWF0 ZShWOFByb3h5KiBwcm94eSwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiByZXNvbHZlcik7CiAKICAg ICB2aXJ0dWFsIH5WOEN1c3RvbVhQYXRoTlNSZXNvbHZlcigpOwogICAgIHZpcnR1YWwgU3RyaW5n IGxvb2t1cE5hbWVzcGFjZVVSSShjb25zdCBTdHJpbmcmIHByZWZpeCk7CiAKIHByaXZhdGU6Ci0g ICAgVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiByZXNvbHZl cik7CisgICAgVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIoVjhQcm94eSogcHJveHksIHY4OjpIYW5k bGU8djg6Ok9iamVjdD4gcmVzb2x2ZXIpOwogCisgICAgVjhQcm94eSogbV9wcm94eTsKICAgICB2 ODo6SGFuZGxlPHY4OjpPYmplY3Q+IG1fcmVzb2x2ZXI7ICAvLyBIYW5kbGUgdG8gcmVzb2x2ZXIg b2JqZWN0LgogfTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhE b2N1bWVudEN1c3RvbS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERvY3VtZW50 Q3VzdG9tLmNwcAppbmRleCBmOTIxYTgwLi42MTc3NTkzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L2N1c3RvbS9WOERvY3VtZW50Q3VzdG9tLmNwcAorKysgYi9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOERvY3VtZW50Q3VzdG9tLmNwcApAQCAtNjEsNyArNjEsNyBAQCBDQUxM QkFDS19GVU5DX0RFQ0woRG9jdW1lbnRFdmFsdWF0ZSkKICAgICBpZiAoVjhOb2RlOjpIYXNJbnN0 YW5jZShhcmdzWzFdKSkKICAgICAgICAgY29udGV4dE5vZGUgPSBWOERPTVdyYXBwZXI6OmNvbnZl cnRET01XcmFwcGVyVG9Ob2RlPE5vZGU+KHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QoYXJn c1sxXSkpOwogCi0gICAgUmVmUHRyPFhQYXRoTlNSZXNvbHZlcj4gcmVzb2x2ZXIgPSBWOERPTVdy YXBwZXI6OmdldFhQYXRoTlNSZXNvbHZlcihhcmdzWzJdKTsKKyAgICBSZWZQdHI8WFBhdGhOU1Jl c29sdmVyPiByZXNvbHZlciA9IFY4RE9NV3JhcHBlcjo6Z2V0WFBhdGhOU1Jlc29sdmVyKGFyZ3Nb Ml0sIFY4UHJveHk6OnJldHJpZXZlKFY4UHJveHk6OnJldHJpZXZlRnJhbWVGb3JDYWxsaW5nQ29u dGV4dCgpKSk7CiAgICAgaWYgKCFyZXNvbHZlciAmJiAhYXJnc1syXS0+SXNOdWxsKCkgJiYgIWFy Z3NbMl0tPklzVW5kZWZpbmVkKCkpCiAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKFRZUEVfTUlT TUFUQ0hfRVJSKTsKIAo=