60489 2011-05-09 11:48:28 -0700 XSSAuditor should be more selective about the <meta http-equivs> that it blocks 2011-05-09 14:20:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth commit-queue dbates eric oldest_to_newest 400615 0 abarth 2011-05-09 11:48:28 -0700 XSSAuditor should be more selective about the <meta http-equivs> that it blocks 400617 1 92815 abarth 2011-05-09 11:52:37 -0700 Created attachment 92815 Patch 400628 2 92815 dbates 2011-05-09 12:00:07 -0700 Comment on attachment 92815 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92815&action=review > Source/WebCore/ChangeLog:28 > + (WebCore::isNonCanonicalCharacter): > + (WebCore::canonicalize): > + (WebCore::isRequiredForInjection): > + (WebCore::hasName): > + (WebCore::findAttributeWithName): > + (WebCore::isNameOfInlineEventHandler): > + (WebCore::isDangerousHTTPEquiv): > + (WebCore::containsJavaScriptURL): > + (WebCore::decodeURL): > + (WebCore::XSSFilter::eraseAttributeIfInjected): Most of the changes to these methods is because this patch moves them from being in an anonymous namespace to being static functions. So, as to demarcate the syntactic change from the actual change for this bug I suggest adding a remark to the right of isDangerousHTTPEquiv to mention that it was added and add some sort of remark to the other functions (or general sentence to the commit message) to describe the syntactic changes. Alternatively, you could split this into two patches/bugs. One to move the methods from being in an anonymous namespace to being static functions. And one patch/bug to actually make the change described in this bug. 400631 3 92815 dbates 2011-05-09 12:01:16 -0700 Comment on attachment 92815 Patch Also, can we test this change? 400633 4 92821 abarth 2011-05-09 12:03:04 -0700 Created attachment 92821 Patch for landing 400634 5 92821 abarth 2011-05-09 12:03:34 -0700 Comment on attachment 92821 Patch for landing Updated patch. Eric and I were discussing how and whether we want a test for this patch. 400654 6 92826 abarth 2011-05-09 12:25:06 -0700 Created attachment 92826 Patch for landing 400750 7 92826 commit-queue 2011-05-09 14:20:32 -0700 Comment on attachment 92826 Patch for landing Clearing flags on attachment: 92826 Committed r86087: <http://trac.webkit.org/changeset/86087> 400751 8 commit-queue 2011-05-09 14:20:38 -0700 All reviewed patches have been landed. Closing bug. 92815 2011-05-09 11:52:37 -0700 2011-05-09 12:03:01 -0700 Patch bug-60489-20110509115235.patch text/plain 5297 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MDcyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDUtMDkgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBYU1NBdWRpdG9yIHNob3VsZCBiZSBtb3JlIHNlbGVjdGl2ZSBhYm91 dCB0aGUgPG1ldGEgaHR0cC1lcXVpdnM+IHRoYXQgaXQgYmxvY2tzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDQ4OQorCisgICAgICAgIFdlIGRvbid0 IG5lZWQgdG8gZmlsdGVyIG1vc3QgaHR0cC1lcXVpdiBhdHRyaWJ1dGVzLiAgVGhpcyBwYXRjaAor ICAgICAgICBpbnRyb2R1Y2VzIGEgYmxhY2tsaXN0IGZvciB0d28gdGhhdCB3ZSBwcm9iYWJseSBk byB3YW50IHRvIGZpbHRlci4KKyAgICAgICAgSXQncyBwb3NzaWJsZSBhIHdoaXRlbGlzdCB3b3Vs ZCBiZSBtb3JlIGFwcHJvcHJpYXRlLCBidXQgSSdtIGluY2xpbmVkCisgICAgICAgIHRvIHN0YXJ0 IHdpdGggYSBibGFja2xpc3QgYW5kIHNlZSBob3cgaXQgd29ya3MuCisKKyAgICAgICAgVGhpcyBw YXRjaCB3aWxsIGhvcGVmdWxseSBmaXggYSBmYWxzZSBwb3NpdGl2ZSB0aGF0IGlzIGNhdXNpbmcg ZXJyb3JzCisgICAgICAgIHdpdGggY29weS1hbmQtcGFzdGVkIHRleHQgaW4gR21haWwgaW4gc29t ZSBjb25maWd1cmF0aW9ucyAoZHVlIHRvIHVzaW5nCisgICAgICAgIHRoZSA8bWV0YT4gdGFnIHRv IHJlcXVlc3QgVVRGLTggZW5jb2RpbmcgYm90aCBpbiB0aGUgcGFzdGVkIHRleHQgYW5kIGluCisg ICAgICAgIHRoZSBwYWdlIGl0c2VsZikuCisKKyAgICAgICAgKiBodG1sL3BhcnNlci9YU1NGaWx0 ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNOb25DYW5vbmljYWxDaGFyYWN0ZXIpOgorICAg ICAgICAoV2ViQ29yZTo6Y2Fub25pY2FsaXplKToKKyAgICAgICAgKFdlYkNvcmU6OmlzUmVxdWly ZWRGb3JJbmplY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6aGFzTmFtZSk6CisgICAgICAgIChX ZWJDb3JlOjpmaW5kQXR0cmlidXRlV2l0aE5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6aXNOYW1l T2ZJbmxpbmVFdmVudEhhbmRsZXIpOgorICAgICAgICAoV2ViQ29yZTo6aXNEYW5nZXJvdXNIVFRQ RXF1aXYpOgorICAgICAgICAoV2ViQ29yZTo6Y29udGFpbnNKYXZhU2NyaXB0VVJMKToKKyAgICAg ICAgKFdlYkNvcmU6OmRlY29kZVVSTCk6CisgICAgICAgIChXZWJDb3JlOjpYU1NGaWx0ZXI6OmVy YXNlQXR0cmlidXRlSWZJbmplY3RlZCk6CisKIDIwMTEtMDUtMDkgIFJvYmluIER1bm4gIDxyb2Jp bkBhbGxkdW5uLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZXZpbiBPbGxpdmllci4KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0ZpbHRlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTRmlsdGVyLmNwcAkocmV2aXNpb24gODYw NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9YU1NGaWx0ZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00NCw5ICs0NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdXNpbmcgbmFt ZXNwYWNlIEhUTUxOYW1lczsKIAotbmFtZXNwYWNlIHsKLQotYm9vbCBpc05vbkNhbm9uaWNhbENo YXJhY3RlcihVQ2hhciBjKQorc3RhdGljIGJvb2wgaXNOb25DYW5vbmljYWxDaGFyYWN0ZXIoVUNo YXIgYykKIHsKICAgICAvLyBXZSByZW1vdmUgYWxsIG5vbi1BU0NJSSBjaGFyYWN0ZXJzLCBpbmNs dWRpbmcgbm9uLXByaW50YWJsZSBBU0NJSSBjaGFyYWN0ZXJzLgogICAgIC8vCkBAIC01OCwyMiAr NTYsMjIgQEAgYm9vbCBpc05vbkNhbm9uaWNhbENoYXJhY3RlcihVQ2hhciBjKQogICAgIHJldHVy biAoYyA9PSAnXFwnIHx8IGMgPT0gJzAnIHx8IGMgPT0gJ1wwJyB8fCBjID49IDEyNyk7CiB9CiAK LVN0cmluZyBjYW5vbmljYWxpemUoY29uc3QgU3RyaW5nJiBzdHJpbmcpCitzdGF0aWMgU3RyaW5n IGNhbm9uaWNhbGl6ZShjb25zdCBTdHJpbmcmIHN0cmluZykKIHsKICAgICByZXR1cm4gc3RyaW5n LnJlbW92ZUNoYXJhY3RlcnMoJmlzTm9uQ2Fub25pY2FsQ2hhcmFjdGVyKTsKIH0KIAotYm9vbCBp c1JlcXVpcmVkRm9ySW5qZWN0aW9uKFVDaGFyIGMpCitzdGF0aWMgYm9vbCBpc1JlcXVpcmVkRm9y SW5qZWN0aW9uKFVDaGFyIGMpCiB7CiAgICAgcmV0dXJuIChjID09ICdcJycgfHwgYyA9PSAnIicg fHwgYyA9PSAnPCcgfHwgYyA9PSAnPicpOwogfQogCi1ib29sIGhhc05hbWUoY29uc3QgSFRNTFRv a2VuJiB0b2tlbiwgY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSkKK3N0YXRpYyBib29sIGhhc05h bWUoY29uc3QgSFRNTFRva2VuJiB0b2tlbiwgY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSkKIHsK ICAgICByZXR1cm4gZXF1YWxJZ25vcmluZ051bGxpdHkodG9rZW4ubmFtZSgpLCBzdGF0aWNfY2Fz dDxjb25zdCBTdHJpbmcmPihuYW1lLmxvY2FsTmFtZSgpKSk7CiB9CiAKLWJvb2wgZmluZEF0dHJp YnV0ZVdpdGhOYW1lKGNvbnN0IEhUTUxUb2tlbiYgdG9rZW4sIGNvbnN0IFF1YWxpZmllZE5hbWUm IG5hbWUsIHNpemVfdCYgaW5kZXhPZk1hdGNoaW5nQXR0cmlidXRlKQorc3RhdGljIGJvb2wgZmlu ZEF0dHJpYnV0ZVdpdGhOYW1lKGNvbnN0IEhUTUxUb2tlbiYgdG9rZW4sIGNvbnN0IFF1YWxpZmll ZE5hbWUmIG5hbWUsIHNpemVfdCYgaW5kZXhPZk1hdGNoaW5nQXR0cmlidXRlKQogewogICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgdG9rZW4uYXR0cmlidXRlcygpLnNpemUoKTsgKytpKSB7CiAg ICAgICAgIGlmIChlcXVhbElnbm9yaW5nTnVsbGl0eSh0b2tlbi5hdHRyaWJ1dGVzKCkuYXQoaSku bV9uYW1lLCBuYW1lLmxvY2FsTmFtZSgpKSkgewpAQCAtODQsNyArODIsNyBAQCBib29sIGZpbmRB dHRyaWJ1dGVXaXRoTmFtZShjb25zdCBIVE1MVG9rCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1i b29sIGlzTmFtZU9mSW5saW5lRXZlbnRIYW5kbGVyKGNvbnN0IFZlY3RvcjxVQ2hhciwgMzI+JiBu YW1lKQorc3RhdGljIGJvb2wgaXNOYW1lT2ZJbmxpbmVFdmVudEhhbmRsZXIoY29uc3QgVmVjdG9y PFVDaGFyLCAzMj4mIG5hbWUpCiB7CiAgICAgY29uc3Qgc2l6ZV90IGxlbmd0aE9mU2hvcnRlc3RJ bmxpbmVFdmVudEhhbmRsZXJOYW1lID0gNTsgLy8gVG8gd2l0OiBvbmN1dC4KICAgICBpZiAobmFt ZS5zaXplKCkgPCBsZW5ndGhPZlNob3J0ZXN0SW5saW5lRXZlbnRIYW5kbGVyTmFtZSkKQEAgLTky LDcgKzkwLDEzIEBAIGJvb2wgaXNOYW1lT2ZJbmxpbmVFdmVudEhhbmRsZXIoY29uc3QgVmUKICAg ICByZXR1cm4gbmFtZVswXSA9PSAnbycgJiYgbmFtZVsxXSA9PSAnbic7CiB9CiAKLWJvb2wgY29u dGFpbnNKYXZhU2NyaXB0VVJMKGNvbnN0IFZlY3RvcjxVQ2hhciwgMzI+JiB2YWx1ZSkKK3N0YXRp YyBib29sIGlzRGFuZ2Vyb3VzSFRUUEVxdWl2KGNvbnN0IFN0cmluZyYgdmFsdWUpCit7CisgICAg U3RyaW5nIGVxdWl2ID0gdmFsdWUuc3RyaXBXaGl0ZVNwYWNlKCk7CisgICAgcmV0dXJuIGVxdWFs SWdub3JpbmdDYXNlKGVxdWl2LCAicmVmcmVzaCIpIHx8IGVxdWFsSWdub3JpbmdDYXNlKGVxdWl2 LCAic2V0LWNvb2tpZSIpOworfQorCitzdGF0aWMgYm9vbCBjb250YWluc0phdmFTY3JpcHRVUkwo Y29uc3QgVmVjdG9yPFVDaGFyLCAzMj4mIHZhbHVlKQogewogICAgIHN0YXRpYyBjb25zdCBjaGFy IGphdmFTY3JpcHRTY2hlbWVbXSA9ICJqYXZhc2NyaXB0OiI7CiAgICAgc3RhdGljIGNvbnN0IHNp emVfdCBsZW5ndGhPZkphdmFTY3JpcHRTY2hlbWUgPSBzaXplb2YoamF2YVNjcmlwdFNjaGVtZSkg LSAxOwpAQCAtMTA5LDcgKzExMyw3IEBAIGJvb2wgY29udGFpbnNKYXZhU2NyaXB0VVJMKGNvbnN0 IFZlY3RvcjwKICAgICByZXR1cm4gZXF1YWxJZ25vcmluZ0Nhc2UodmFsdWUuZGF0YSgpICsgaSwg amF2YVNjcmlwdFNjaGVtZSwgbGVuZ3RoT2ZKYXZhU2NyaXB0U2NoZW1lKTsKIH0KIAotU3RyaW5n IGRlY29kZVVSTChjb25zdCBTdHJpbmcmIHN0cmluZywgY29uc3QgVGV4dEVuY29kaW5nJiBlbmNv ZGluZykKK3N0YXRpYyBTdHJpbmcgZGVjb2RlVVJMKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBjb25z dCBUZXh0RW5jb2RpbmcmIGVuY29kaW5nKQogewogICAgIFN0cmluZyB3b3JraW5nU3RyaW5nID0g c3RyaW5nOwogICAgIHdvcmtpbmdTdHJpbmcucmVwbGFjZSgnKycsICcgJyk7CkBAIC0xMjIsOCAr MTI2LDYgQEAgU3RyaW5nIGRlY29kZVVSTChjb25zdCBTdHJpbmcmIHN0cmluZywgYwogICAgIHJl dHVybiBjYW5vbmljYWxpemUoZGVjb2RlZFN0cmluZyk7CiB9CiAKLX0KLQogWFNTRmlsdGVyOjpY U1NGaWx0ZXIoSFRNTERvY3VtZW50UGFyc2VyKiBwYXJzZXIpCiAgICAgOiBtX3BhcnNlcihwYXJz ZXIpCiAgICAgLCBtX2lzRW5hYmxlZChmYWxzZSkKQEAgLTQyMSw2ICs0MjMsOCBAQCBib29sIFhT U0ZpbHRlcjo6ZXJhc2VBdHRyaWJ1dGVJZkluamVjdGVkCiAgICAgICAgIGlmIChpc0NvbnRhaW5l ZEluUmVxdWVzdChzbmlwcGV0Rm9yQXR0cmlidXRlKHRva2VuLCBhdHRyaWJ1dGUpKSkgewogICAg ICAgICAgICAgaWYgKGF0dHJpYnV0ZU5hbWUgPT0gc3JjQXR0ciAmJiBpc1NhbWVPcmlnaW5SZXNv dXJjZShTdHJpbmcoYXR0cmlidXRlLm1fdmFsdWUuZGF0YSgpLCBhdHRyaWJ1dGUubV92YWx1ZS5z aXplKCkpKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICBpZiAo YXR0cmlidXRlTmFtZSA9PSBodHRwX2VxdWl2QXR0ciAmJiAhaXNEYW5nZXJvdXNIVFRQRXF1aXYo U3RyaW5nKGF0dHJpYnV0ZS5tX3ZhbHVlLmRhdGEoKSwgYXR0cmlidXRlLm1fdmFsdWUuc2l6ZSgp KSkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgdG9rZW4uZXJh c2VWYWx1ZU9mQXR0cmlidXRlKGluZGV4T2ZBdHRyaWJ1dGUpOwogICAgICAgICAgICAgaWYgKCFy ZXBsYWNlbWVudFZhbHVlLmlzRW1wdHkoKSkKICAgICAgICAgICAgICAgICB0b2tlbi5hcHBlbmRU b0F0dHJpYnV0ZVZhbHVlKGluZGV4T2ZBdHRyaWJ1dGUsIHJlcGxhY2VtZW50VmFsdWUpOwo= 92821 2011-05-09 12:03:04 -0700 2011-05-09 12:25:03 -0700 Patch for landing bug-60489-20110509120303.patch text/plain 5566 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MDcyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDUtMDkgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0 ZXMuCisKKyAgICAgICAgWFNTQXVkaXRvciBzaG91bGQgYmUgbW9yZSBzZWxlY3RpdmUgYWJvdXQg dGhlIDxtZXRhIGh0dHAtZXF1aXZzPiB0aGF0IGl0IGJsb2NrcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA0ODkKKworICAgICAgICBXZSBkb24ndCBu ZWVkIHRvIGZpbHRlciBtb3N0IGh0dHAtZXF1aXYgYXR0cmlidXRlcy4gIFRoaXMgcGF0Y2gKKyAg ICAgICAgaW50cm9kdWNlcyBhIGJsYWNrbGlzdCBmb3IgdHdvIHRoYXQgd2UgcHJvYmFibHkgZG8g d2FudCB0byBmaWx0ZXIuCisgICAgICAgIEl0J3MgcG9zc2libGUgYSB3aGl0ZWxpc3Qgd291bGQg YmUgbW9yZSBhcHByb3ByaWF0ZSwgYnV0IEknbSBpbmNsaW5lZAorICAgICAgICB0byBzdGFydCB3 aXRoIGEgYmxhY2tsaXN0IGFuZCBzZWUgaG93IGl0IHdvcmtzLgorCisgICAgICAgIFRoaXMgcGF0 Y2ggd2lsbCBob3BlZnVsbHkgZml4IGEgZmFsc2UgcG9zaXRpdmUgdGhhdCBpcyBjYXVzaW5nIGVy cm9ycworICAgICAgICB3aXRoIGNvcHktYW5kLXBhc3RlZCB0ZXh0IGluIEdtYWlsIGluIHNvbWUg Y29uZmlndXJhdGlvbnMgKGR1ZSB0byB1c2luZworICAgICAgICB0aGUgPG1ldGE+IHRhZyB0byBy ZXF1ZXN0IFVURi04IGVuY29kaW5nIGJvdGggaW4gdGhlIHBhc3RlZCB0ZXh0IGFuZCBpbgorICAg ICAgICB0aGUgcGFnZSBpdHNlbGYpLgorCisgICAgICAgICogaHRtbC9wYXJzZXIvWFNTRmlsdGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzTm9uQ2Fub25pY2FsQ2hhcmFjdGVyKToKKyAgICAg ICAgKFdlYkNvcmU6OmNhbm9uaWNhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjppc1JlcXVpcmVk Rm9ySW5qZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Omhhc05hbWUpOgorICAgICAgICAoV2Vi Q29yZTo6ZmluZEF0dHJpYnV0ZVdpdGhOYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OmlzTmFtZU9m SW5saW5lRXZlbnRIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OmlzRGFuZ2Vyb3VzSFRUUEVx dWl2KToKKyAgICAgICAgICAgIC0gVGhpcyBmdW5jdGlvbiBpcyBuZXcgaW4gdGhlIHBhdGNoIGFu ZCBpbmNsdWRlcyBhIGJsYWNrbGlzdCBvZgorICAgICAgICAgICAgICBkYW5nZXJvdXMgaHR0cC1l cXVpdnMuICBNYW55IG9mIHRoZSBvdGhlciBmdW5jdGlvbnMgbGlzdGVkIGhlcmUKKyAgICAgICAg ICAgICAgYXJlIGp1c3QgYmVpbmcgbW92ZWQgZnJvbSBhbiBhbm9ueW1vdXMgbmFtZXNwYWNlIHRv IHVzZSBzdGF0aWMKKyAgICAgICAgICAgICAgZm9yIGludGVybmFsIGxpbmthZ2UuCisgICAgICAg IChXZWJDb3JlOjpjb250YWluc0phdmFTY3JpcHRVUkwpOgorICAgICAgICAoV2ViQ29yZTo6ZGVj b2RlVVJMKToKKyAgICAgICAgKFdlYkNvcmU6OlhTU0ZpbHRlcjo6ZXJhc2VBdHRyaWJ1dGVJZklu amVjdGVkKToKKwogMjAxMS0wNS0wOSAgUm9iaW4gRHVubiAgPHJvYmluQGFsbGR1bm4uY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEtldmluIE9sbGl2aWVyLgpJbmRleDogU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvWFNTRmlsdGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9YU1NGaWx0ZXIuY3BwCShyZXZpc2lvbiA4NjA2MSkKKysrIFNvdXJjZS9X ZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0ZpbHRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDkg KzQ0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVz OwogCi1uYW1lc3BhY2UgewotCi1ib29sIGlzTm9uQ2Fub25pY2FsQ2hhcmFjdGVyKFVDaGFyIGMp CitzdGF0aWMgYm9vbCBpc05vbkNhbm9uaWNhbENoYXJhY3RlcihVQ2hhciBjKQogewogICAgIC8v IFdlIHJlbW92ZSBhbGwgbm9uLUFTQ0lJIGNoYXJhY3RlcnMsIGluY2x1ZGluZyBub24tcHJpbnRh YmxlIEFTQ0lJIGNoYXJhY3RlcnMuCiAgICAgLy8KQEAgLTU4LDIyICs1NiwyMiBAQCBib29sIGlz Tm9uQ2Fub25pY2FsQ2hhcmFjdGVyKFVDaGFyIGMpCiAgICAgcmV0dXJuIChjID09ICdcXCcgfHwg YyA9PSAnMCcgfHwgYyA9PSAnXDAnIHx8IGMgPj0gMTI3KTsKIH0KIAotU3RyaW5nIGNhbm9uaWNh bGl6ZShjb25zdCBTdHJpbmcmIHN0cmluZykKK3N0YXRpYyBTdHJpbmcgY2Fub25pY2FsaXplKGNv bnN0IFN0cmluZyYgc3RyaW5nKQogewogICAgIHJldHVybiBzdHJpbmcucmVtb3ZlQ2hhcmFjdGVy cygmaXNOb25DYW5vbmljYWxDaGFyYWN0ZXIpOwogfQogCi1ib29sIGlzUmVxdWlyZWRGb3JJbmpl Y3Rpb24oVUNoYXIgYykKK3N0YXRpYyBib29sIGlzUmVxdWlyZWRGb3JJbmplY3Rpb24oVUNoYXIg YykKIHsKICAgICByZXR1cm4gKGMgPT0gJ1wnJyB8fCBjID09ICciJyB8fCBjID09ICc8JyB8fCBj ID09ICc+Jyk7CiB9CiAKLWJvb2wgaGFzTmFtZShjb25zdCBIVE1MVG9rZW4mIHRva2VuLCBjb25z dCBRdWFsaWZpZWROYW1lJiBuYW1lKQorc3RhdGljIGJvb2wgaGFzTmFtZShjb25zdCBIVE1MVG9r ZW4mIHRva2VuLCBjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lKQogewogICAgIHJldHVybiBlcXVh bElnbm9yaW5nTnVsbGl0eSh0b2tlbi5uYW1lKCksIHN0YXRpY19jYXN0PGNvbnN0IFN0cmluZyY+ KG5hbWUubG9jYWxOYW1lKCkpKTsKIH0KIAotYm9vbCBmaW5kQXR0cmlidXRlV2l0aE5hbWUoY29u c3QgSFRNTFRva2VuJiB0b2tlbiwgY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwgc2l6ZV90JiBp bmRleE9mTWF0Y2hpbmdBdHRyaWJ1dGUpCitzdGF0aWMgYm9vbCBmaW5kQXR0cmlidXRlV2l0aE5h bWUoY29uc3QgSFRNTFRva2VuJiB0b2tlbiwgY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwgc2l6 ZV90JiBpbmRleE9mTWF0Y2hpbmdBdHRyaWJ1dGUpCiB7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCB0b2tlbi5hdHRyaWJ1dGVzKCkuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgaWYgKGVxdWFs SWdub3JpbmdOdWxsaXR5KHRva2VuLmF0dHJpYnV0ZXMoKS5hdChpKS5tX25hbWUsIG5hbWUubG9j YWxOYW1lKCkpKSB7CkBAIC04NCw3ICs4Miw3IEBAIGJvb2wgZmluZEF0dHJpYnV0ZVdpdGhOYW1l KGNvbnN0IEhUTUxUb2sKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgaXNOYW1lT2ZJbmxp bmVFdmVudEhhbmRsZXIoY29uc3QgVmVjdG9yPFVDaGFyLCAzMj4mIG5hbWUpCitzdGF0aWMgYm9v bCBpc05hbWVPZklubGluZUV2ZW50SGFuZGxlcihjb25zdCBWZWN0b3I8VUNoYXIsIDMyPiYgbmFt ZSkKIHsKICAgICBjb25zdCBzaXplX3QgbGVuZ3RoT2ZTaG9ydGVzdElubGluZUV2ZW50SGFuZGxl ck5hbWUgPSA1OyAvLyBUbyB3aXQ6IG9uY3V0LgogICAgIGlmIChuYW1lLnNpemUoKSA8IGxlbmd0 aE9mU2hvcnRlc3RJbmxpbmVFdmVudEhhbmRsZXJOYW1lKQpAQCAtOTIsNyArOTAsMTMgQEAgYm9v bCBpc05hbWVPZklubGluZUV2ZW50SGFuZGxlcihjb25zdCBWZQogICAgIHJldHVybiBuYW1lWzBd ID09ICdvJyAmJiBuYW1lWzFdID09ICduJzsKIH0KIAotYm9vbCBjb250YWluc0phdmFTY3JpcHRV UkwoY29uc3QgVmVjdG9yPFVDaGFyLCAzMj4mIHZhbHVlKQorc3RhdGljIGJvb2wgaXNEYW5nZXJv dXNIVFRQRXF1aXYoY29uc3QgU3RyaW5nJiB2YWx1ZSkKK3sKKyAgICBTdHJpbmcgZXF1aXYgPSB2 YWx1ZS5zdHJpcFdoaXRlU3BhY2UoKTsKKyAgICByZXR1cm4gZXF1YWxJZ25vcmluZ0Nhc2UoZXF1 aXYsICJyZWZyZXNoIikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZXF1aXYsICJzZXQtY29va2llIik7 Cit9CisKK3N0YXRpYyBib29sIGNvbnRhaW5zSmF2YVNjcmlwdFVSTChjb25zdCBWZWN0b3I8VUNo YXIsIDMyPiYgdmFsdWUpCiB7CiAgICAgc3RhdGljIGNvbnN0IGNoYXIgamF2YVNjcmlwdFNjaGVt ZVtdID0gImphdmFzY3JpcHQ6IjsKICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IGxlbmd0aE9mSmF2 YVNjcmlwdFNjaGVtZSA9IHNpemVvZihqYXZhU2NyaXB0U2NoZW1lKSAtIDE7CkBAIC0xMDksNyAr MTEzLDcgQEAgYm9vbCBjb250YWluc0phdmFTY3JpcHRVUkwoY29uc3QgVmVjdG9yPAogICAgIHJl dHVybiBlcXVhbElnbm9yaW5nQ2FzZSh2YWx1ZS5kYXRhKCkgKyBpLCBqYXZhU2NyaXB0U2NoZW1l LCBsZW5ndGhPZkphdmFTY3JpcHRTY2hlbWUpOwogfQogCi1TdHJpbmcgZGVjb2RlVVJMKGNvbnN0 IFN0cmluZyYgc3RyaW5nLCBjb25zdCBUZXh0RW5jb2RpbmcmIGVuY29kaW5nKQorc3RhdGljIFN0 cmluZyBkZWNvZGVVUkwoY29uc3QgU3RyaW5nJiBzdHJpbmcsIGNvbnN0IFRleHRFbmNvZGluZyYg ZW5jb2RpbmcpCiB7CiAgICAgU3RyaW5nIHdvcmtpbmdTdHJpbmcgPSBzdHJpbmc7CiAgICAgd29y a2luZ1N0cmluZy5yZXBsYWNlKCcrJywgJyAnKTsKQEAgLTEyMiw4ICsxMjYsNiBAQCBTdHJpbmcg ZGVjb2RlVVJMKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBjCiAgICAgcmV0dXJuIGNhbm9uaWNhbGl6 ZShkZWNvZGVkU3RyaW5nKTsKIH0KIAotfQotCiBYU1NGaWx0ZXI6OlhTU0ZpbHRlcihIVE1MRG9j dW1lbnRQYXJzZXIqIHBhcnNlcikKICAgICA6IG1fcGFyc2VyKHBhcnNlcikKICAgICAsIG1faXNF bmFibGVkKGZhbHNlKQpAQCAtNDIxLDYgKzQyMyw4IEBAIGJvb2wgWFNTRmlsdGVyOjplcmFzZUF0 dHJpYnV0ZUlmSW5qZWN0ZWQKICAgICAgICAgaWYgKGlzQ29udGFpbmVkSW5SZXF1ZXN0KHNuaXBw ZXRGb3JBdHRyaWJ1dGUodG9rZW4sIGF0dHJpYnV0ZSkpKSB7CiAgICAgICAgICAgICBpZiAoYXR0 cmlidXRlTmFtZSA9PSBzcmNBdHRyICYmIGlzU2FtZU9yaWdpblJlc291cmNlKFN0cmluZyhhdHRy aWJ1dGUubV92YWx1ZS5kYXRhKCksIGF0dHJpYnV0ZS5tX3ZhbHVlLnNpemUoKSkpKQogICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIGlmIChhdHRyaWJ1dGVOYW1lID09 IGh0dHBfZXF1aXZBdHRyICYmICFpc0Rhbmdlcm91c0hUVFBFcXVpdihTdHJpbmcoYXR0cmlidXRl Lm1fdmFsdWUuZGF0YSgpLCBhdHRyaWJ1dGUubV92YWx1ZS5zaXplKCkpKSkKKyAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICB0b2tlbi5lcmFzZVZhbHVlT2ZBdHRyaWJ1 dGUoaW5kZXhPZkF0dHJpYnV0ZSk7CiAgICAgICAgICAgICBpZiAoIXJlcGxhY2VtZW50VmFsdWUu aXNFbXB0eSgpKQogICAgICAgICAgICAgICAgIHRva2VuLmFwcGVuZFRvQXR0cmlidXRlVmFsdWUo aW5kZXhPZkF0dHJpYnV0ZSwgcmVwbGFjZW1lbnRWYWx1ZSk7Cg== 92826 2011-05-09 12:25:06 -0700 2011-05-09 14:20:32 -0700 Patch for landing bug-60489-20110509122505.patch text/plain 7004 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MDcyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDUtMDkgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0 ZXMuCisKKyAgICAgICAgWFNTQXVkaXRvciBzaG91bGQgYmUgbW9yZSBzZWxlY3RpdmUgYWJvdXQg dGhlIDxtZXRhIGh0dHAtZXF1aXZzPiB0aGF0IGl0IGJsb2NrcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA0ODkKKworICAgICAgICBXZSBkb24ndCBu ZWVkIHRvIGZpbHRlciBtb3N0IGh0dHAtZXF1aXYgYXR0cmlidXRlcy4gIFRoaXMgcGF0Y2gKKyAg ICAgICAgaW50cm9kdWNlcyBhIGJsYWNrbGlzdCBmb3IgdHdvIHRoYXQgd2UgcHJvYmFibHkgZG8g d2FudCB0byBmaWx0ZXIuCisgICAgICAgIEl0J3MgcG9zc2libGUgYSB3aGl0ZWxpc3Qgd291bGQg YmUgbW9yZSBhcHByb3ByaWF0ZSwgYnV0IEknbSBpbmNsaW5lZAorICAgICAgICB0byBzdGFydCB3 aXRoIGEgYmxhY2tsaXN0IGFuZCBzZWUgaG93IGl0IHdvcmtzLgorCisgICAgICAgIFRoaXMgcGF0 Y2ggd2lsbCBob3BlZnVsbHkgZml4IGEgZmFsc2UgcG9zaXRpdmUgdGhhdCBpcyBjYXVzaW5nIGVy cm9ycworICAgICAgICB3aXRoIGNvcHktYW5kLXBhc3RlZCB0ZXh0IGluIEdtYWlsIGluIHNvbWUg Y29uZmlndXJhdGlvbnMgKGR1ZSB0byB1c2luZworICAgICAgICB0aGUgPG1ldGE+IHRhZyB0byBy ZXF1ZXN0IFVURi04IGVuY29kaW5nIGJvdGggaW4gdGhlIHBhc3RlZCB0ZXh0IGFuZCBpbgorICAg ICAgICB0aGUgcGFnZSBpdHNlbGYpLgorCisgICAgICAgICogaHRtbC9wYXJzZXIvWFNTRmlsdGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzTm9uQ2Fub25pY2FsQ2hhcmFjdGVyKToKKyAgICAg ICAgKFdlYkNvcmU6OmNhbm9uaWNhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjppc1JlcXVpcmVk Rm9ySW5qZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Omhhc05hbWUpOgorICAgICAgICAoV2Vi Q29yZTo6ZmluZEF0dHJpYnV0ZVdpdGhOYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OmlzTmFtZU9m SW5saW5lRXZlbnRIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OmlzRGFuZ2Vyb3VzSFRUUEVx dWl2KToKKyAgICAgICAgICAgIC0gVGhpcyBmdW5jdGlvbiBpcyBuZXcgaW4gdGhlIHBhdGNoIGFu ZCBpbmNsdWRlcyBhIGJsYWNrbGlzdCBvZgorICAgICAgICAgICAgICBkYW5nZXJvdXMgaHR0cC1l cXVpdnMuICBNYW55IG9mIHRoZSBvdGhlciBmdW5jdGlvbnMgbGlzdGVkIGhlcmUKKyAgICAgICAg ICAgICAgYXJlIGp1c3QgYmVpbmcgbW92ZWQgZnJvbSBhbiBhbm9ueW1vdXMgbmFtZXNwYWNlIHRv IHVzZSBzdGF0aWMKKyAgICAgICAgICAgICAgZm9yIGludGVybmFsIGxpbmthZ2UuCisgICAgICAg IChXZWJDb3JlOjpjb250YWluc0phdmFTY3JpcHRVUkwpOgorICAgICAgICAoV2ViQ29yZTo6ZGVj b2RlVVJMKToKKyAgICAgICAgKFdlYkNvcmU6OlhTU0ZpbHRlcjo6ZXJhc2VBdHRyaWJ1dGVJZklu amVjdGVkKToKKwogMjAxMS0wNS0wOSAgUm9iaW4gRHVubiAgPHJvYmluQGFsbGR1bm4uY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEtldmluIE9sbGl2aWVyLgpJbmRleDogU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvWFNTRmlsdGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9YU1NGaWx0ZXIuY3BwCShyZXZpc2lvbiA4NjA2MSkKKysrIFNvdXJjZS9X ZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0ZpbHRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDkg KzQ0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVz OwogCi1uYW1lc3BhY2UgewotCi1ib29sIGlzTm9uQ2Fub25pY2FsQ2hhcmFjdGVyKFVDaGFyIGMp CitzdGF0aWMgYm9vbCBpc05vbkNhbm9uaWNhbENoYXJhY3RlcihVQ2hhciBjKQogewogICAgIC8v IFdlIHJlbW92ZSBhbGwgbm9uLUFTQ0lJIGNoYXJhY3RlcnMsIGluY2x1ZGluZyBub24tcHJpbnRh YmxlIEFTQ0lJIGNoYXJhY3RlcnMuCiAgICAgLy8KQEAgLTU4LDIyICs1NiwyMiBAQCBib29sIGlz Tm9uQ2Fub25pY2FsQ2hhcmFjdGVyKFVDaGFyIGMpCiAgICAgcmV0dXJuIChjID09ICdcXCcgfHwg YyA9PSAnMCcgfHwgYyA9PSAnXDAnIHx8IGMgPj0gMTI3KTsKIH0KIAotU3RyaW5nIGNhbm9uaWNh bGl6ZShjb25zdCBTdHJpbmcmIHN0cmluZykKK3N0YXRpYyBTdHJpbmcgY2Fub25pY2FsaXplKGNv bnN0IFN0cmluZyYgc3RyaW5nKQogewogICAgIHJldHVybiBzdHJpbmcucmVtb3ZlQ2hhcmFjdGVy cygmaXNOb25DYW5vbmljYWxDaGFyYWN0ZXIpOwogfQogCi1ib29sIGlzUmVxdWlyZWRGb3JJbmpl Y3Rpb24oVUNoYXIgYykKK3N0YXRpYyBib29sIGlzUmVxdWlyZWRGb3JJbmplY3Rpb24oVUNoYXIg YykKIHsKICAgICByZXR1cm4gKGMgPT0gJ1wnJyB8fCBjID09ICciJyB8fCBjID09ICc8JyB8fCBj ID09ICc+Jyk7CiB9CiAKLWJvb2wgaGFzTmFtZShjb25zdCBIVE1MVG9rZW4mIHRva2VuLCBjb25z dCBRdWFsaWZpZWROYW1lJiBuYW1lKQorc3RhdGljIGJvb2wgaGFzTmFtZShjb25zdCBIVE1MVG9r ZW4mIHRva2VuLCBjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lKQogewogICAgIHJldHVybiBlcXVh bElnbm9yaW5nTnVsbGl0eSh0b2tlbi5uYW1lKCksIHN0YXRpY19jYXN0PGNvbnN0IFN0cmluZyY+ KG5hbWUubG9jYWxOYW1lKCkpKTsKIH0KIAotYm9vbCBmaW5kQXR0cmlidXRlV2l0aE5hbWUoY29u c3QgSFRNTFRva2VuJiB0b2tlbiwgY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwgc2l6ZV90JiBp bmRleE9mTWF0Y2hpbmdBdHRyaWJ1dGUpCitzdGF0aWMgYm9vbCBmaW5kQXR0cmlidXRlV2l0aE5h bWUoY29uc3QgSFRNTFRva2VuJiB0b2tlbiwgY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwgc2l6 ZV90JiBpbmRleE9mTWF0Y2hpbmdBdHRyaWJ1dGUpCiB7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCB0b2tlbi5hdHRyaWJ1dGVzKCkuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgaWYgKGVxdWFs SWdub3JpbmdOdWxsaXR5KHRva2VuLmF0dHJpYnV0ZXMoKS5hdChpKS5tX25hbWUsIG5hbWUubG9j YWxOYW1lKCkpKSB7CkBAIC04NCw3ICs4Miw3IEBAIGJvb2wgZmluZEF0dHJpYnV0ZVdpdGhOYW1l KGNvbnN0IEhUTUxUb2sKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgaXNOYW1lT2ZJbmxp bmVFdmVudEhhbmRsZXIoY29uc3QgVmVjdG9yPFVDaGFyLCAzMj4mIG5hbWUpCitzdGF0aWMgYm9v bCBpc05hbWVPZklubGluZUV2ZW50SGFuZGxlcihjb25zdCBWZWN0b3I8VUNoYXIsIDMyPiYgbmFt ZSkKIHsKICAgICBjb25zdCBzaXplX3QgbGVuZ3RoT2ZTaG9ydGVzdElubGluZUV2ZW50SGFuZGxl ck5hbWUgPSA1OyAvLyBUbyB3aXQ6IG9uY3V0LgogICAgIGlmIChuYW1lLnNpemUoKSA8IGxlbmd0 aE9mU2hvcnRlc3RJbmxpbmVFdmVudEhhbmRsZXJOYW1lKQpAQCAtOTIsNyArOTAsMTMgQEAgYm9v bCBpc05hbWVPZklubGluZUV2ZW50SGFuZGxlcihjb25zdCBWZQogICAgIHJldHVybiBuYW1lWzBd ID09ICdvJyAmJiBuYW1lWzFdID09ICduJzsKIH0KIAotYm9vbCBjb250YWluc0phdmFTY3JpcHRV UkwoY29uc3QgVmVjdG9yPFVDaGFyLCAzMj4mIHZhbHVlKQorc3RhdGljIGJvb2wgaXNEYW5nZXJv dXNIVFRQRXF1aXYoY29uc3QgU3RyaW5nJiB2YWx1ZSkKK3sKKyAgICBTdHJpbmcgZXF1aXYgPSB2 YWx1ZS5zdHJpcFdoaXRlU3BhY2UoKTsKKyAgICByZXR1cm4gZXF1YWxJZ25vcmluZ0Nhc2UoZXF1 aXYsICJyZWZyZXNoIikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoZXF1aXYsICJzZXQtY29va2llIik7 Cit9CisKK3N0YXRpYyBib29sIGNvbnRhaW5zSmF2YVNjcmlwdFVSTChjb25zdCBWZWN0b3I8VUNo YXIsIDMyPiYgdmFsdWUpCiB7CiAgICAgc3RhdGljIGNvbnN0IGNoYXIgamF2YVNjcmlwdFNjaGVt ZVtdID0gImphdmFzY3JpcHQ6IjsKICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IGxlbmd0aE9mSmF2 YVNjcmlwdFNjaGVtZSA9IHNpemVvZihqYXZhU2NyaXB0U2NoZW1lKSAtIDE7CkBAIC0xMDksNyAr MTEzLDcgQEAgYm9vbCBjb250YWluc0phdmFTY3JpcHRVUkwoY29uc3QgVmVjdG9yPAogICAgIHJl dHVybiBlcXVhbElnbm9yaW5nQ2FzZSh2YWx1ZS5kYXRhKCkgKyBpLCBqYXZhU2NyaXB0U2NoZW1l LCBsZW5ndGhPZkphdmFTY3JpcHRTY2hlbWUpOwogfQogCi1TdHJpbmcgZGVjb2RlVVJMKGNvbnN0 IFN0cmluZyYgc3RyaW5nLCBjb25zdCBUZXh0RW5jb2RpbmcmIGVuY29kaW5nKQorc3RhdGljIFN0 cmluZyBkZWNvZGVVUkwoY29uc3QgU3RyaW5nJiBzdHJpbmcsIGNvbnN0IFRleHRFbmNvZGluZyYg ZW5jb2RpbmcpCiB7CiAgICAgU3RyaW5nIHdvcmtpbmdTdHJpbmcgPSBzdHJpbmc7CiAgICAgd29y a2luZ1N0cmluZy5yZXBsYWNlKCcrJywgJyAnKTsKQEAgLTEyMiw4ICsxMjYsNiBAQCBTdHJpbmcg ZGVjb2RlVVJMKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBjCiAgICAgcmV0dXJuIGNhbm9uaWNhbGl6 ZShkZWNvZGVkU3RyaW5nKTsKIH0KIAotfQotCiBYU1NGaWx0ZXI6OlhTU0ZpbHRlcihIVE1MRG9j dW1lbnRQYXJzZXIqIHBhcnNlcikKICAgICA6IG1fcGFyc2VyKHBhcnNlcikKICAgICAsIG1faXNF bmFibGVkKGZhbHNlKQpAQCAtNDIxLDYgKzQyMyw4IEBAIGJvb2wgWFNTRmlsdGVyOjplcmFzZUF0 dHJpYnV0ZUlmSW5qZWN0ZWQKICAgICAgICAgaWYgKGlzQ29udGFpbmVkSW5SZXF1ZXN0KHNuaXBw ZXRGb3JBdHRyaWJ1dGUodG9rZW4sIGF0dHJpYnV0ZSkpKSB7CiAgICAgICAgICAgICBpZiAoYXR0 cmlidXRlTmFtZSA9PSBzcmNBdHRyICYmIGlzU2FtZU9yaWdpblJlc291cmNlKFN0cmluZyhhdHRy aWJ1dGUubV92YWx1ZS5kYXRhKCksIGF0dHJpYnV0ZS5tX3ZhbHVlLnNpemUoKSkpKQogICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIGlmIChhdHRyaWJ1dGVOYW1lID09 IGh0dHBfZXF1aXZBdHRyICYmICFpc0Rhbmdlcm91c0hUVFBFcXVpdihTdHJpbmcoYXR0cmlidXRl Lm1fdmFsdWUuZGF0YSgpLCBhdHRyaWJ1dGUubV92YWx1ZS5zaXplKCkpKSkKKyAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICB0b2tlbi5lcmFzZVZhbHVlT2ZBdHRyaWJ1 dGUoaW5kZXhPZkF0dHJpYnV0ZSk7CiAgICAgICAgICAgICBpZiAoIXJlcGxhY2VtZW50VmFsdWUu aXNFbXB0eSgpKQogICAgICAgICAgICAgICAgIHRva2VuLmFwcGVuZFRvQXR0cmlidXRlVmFsdWUo aW5kZXhPZkF0dHJpYnV0ZSwgcmVwbGFjZW1lbnRWYWx1ZSk7CkluZGV4OiBMYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3NlY3VyaXR5L3hzc0F1ZGl0b3IvbWV0YS10YWctaHR0cC1yZWZyZXNoLXgtZnJh bWUtb3B0aW9ucy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9zZWN1cml0eS94c3NBdWRpdG9yL21ldGEtdGFnLWh0dHAtcmVmcmVzaC14LWZyYW1lLW9w dGlvbnMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9zZWN1cml0eS94c3NBdWRpdG9yL21ldGEtdGFnLWh0dHAtcmVmcmVzaC14LWZyYW1lLW9wdGlv bnMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMgQEAKK0NPTlNPTEUgTUVT U0FHRTogbGluZSAxOiBSZWZ1c2VkIHRvIGRpc3BsYXkgZG9jdW1lbnQgYmVjYXVzZSBkaXNwbGF5 IGZvcmJpZGRlbiBieSBYLUZyYW1lLU9wdGlvbnMuCisKKwpJbmRleDogTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zZWN1cml0eS94c3NBdWRpdG9yL21ldGEtdGFnLWh0dHAtcmVmcmVzaC14LWZyYW1l LW9wdGlvbnMuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3Vy aXR5L3hzc0F1ZGl0b3IvbWV0YS10YWctaHR0cC1yZWZyZXNoLXgtZnJhbWUtb3B0aW9ucy5odG1s CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS94c3NBdWRp dG9yL21ldGEtdGFnLWh0dHAtcmVmcmVzaC14LWZyYW1lLW9wdGlvbnMuaHRtbAkocmV2aXNpb24g MCkKQEAgLTAsMCArMSwyMiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNj cmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgbGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRYU1NBdWRp dG9yRW5hYmxlZCh0cnVlKTsKKyAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgp OworfQorCitmdW5jdGlvbiBkb25lKCkKK3sKKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250 cm9sbGVyKQorICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7Cit9Cis8 L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPGlmcmFtZSBvbmxvYWQ9ImRvbmUoKSIgc3JjPSJo dHRwOi8vbG9jYWxob3N0OjgwMDAvc2VjdXJpdHkveHNzQXVkaXRvci9yZXNvdXJjZXMvZWNoby1o ZWFkLnBsP3E9JTNDbWV0YStodHRwLWVxdWl2JTNEJTIyeC1mcmFtZS1vcHRpb25zJTIyK2NvbnRl bnQlM0QlMjJkZW55JTIyJTNFIj4KKzwvaWZyYW1lPgorPC9ib2R5PgorPC9odG1sPgo=