32700 2009-12-17 22:44:13 -0800 WebSocket: Invalid url should raise SYNTAX_ERR exception. 2009-12-21 20:48:00 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ukai webkit-unassigned abarth eric webkit.review.bot oldest_to_newest 173051 0 ukai 2009-12-17 22:44:13 -0800 If it failed to parse the url argument, thow a SYNTAX_ERR exception, as spec says. 173053 1 45125 ukai 2009-12-17 22:58:34 -0800 Created attachment 45125 WebCore: Invalid url should raise SYNTAX_ERR exception. 173054 2 webkit.review.bot 2009-12-17 23:00:31 -0800 style-queue ran check-webkit-style on attachment 45125 without any errors. 173232 3 45125 ap 2009-12-18 11:29:39 -0800 Comment on attachment 45125 WebCore: Invalid url should raise SYNTAX_ERR exception. r=me I wish we could get JavaScript line number for the error messages. 173629 4 ukai 2009-12-19 19:33:45 -0800 Committed r52399: <http://trac.webkit.org/changeset/52399> 173647 5 abarth 2009-12-19 23:37:01 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/websocket/tests/bad-sub-protocol-expected.txt M LayoutTests/websocket/tests/script-tests/url-parsing.js M LayoutTests/websocket/tests/url-parsing-expected.txt M WebCore/ChangeLog M WebCore/websockets/WebSocket.cpp Committed r52402 M WebCore/ChangeLog M WebCore/websockets/WebSocket.cpp M LayoutTests/websocket/tests/url-parsing-expected.txt M LayoutTests/websocket/tests/bad-sub-protocol-expected.txt M LayoutTests/websocket/tests/script-tests/url-parsing.js M LayoutTests/ChangeLog r52402 = e9ae8c0dad923306815a6290589fea519962d3b4 (refs/remotes/trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk 173648 6 45125 abarth 2009-12-19 23:39:00 -0800 Comment on attachment 45125 WebCore: Invalid url should raise SYNTAX_ERR exception. websocket/tests/bad-sub-protocol.html -> failed 173654 7 45258 ukai 2009-12-20 00:45:15 -0800 Created attachment 45258 Invalid url should raise SYNTAX_ERR exception. 173655 8 ukai 2009-12-20 00:50:13 -0800 (In reply to comment #6) > (From update of attachment 45125 [details]) > websocket/tests/bad-sub-protocol.html -> failed Seems it was failed because console message containing a non-printable character differs on windows. http://build.webkit.org/results/Windows%20Release%20(Tests)/r52399%20(7249)/websocket/tests/ protocol string should be ASCII string, so report bad protocol string with escaping. 173656 9 webkit.review.bot 2009-12-20 00:50:24 -0800 style-queue ran check-webkit-style on attachment 45258 without any errors. 173880 10 eric 2009-12-20 23:02:44 -0800 What's the status of this patch? Was it rolled out? 173887 11 ukai 2009-12-20 23:10:22 -0800 (In reply to comment #10) > What's the status of this patch? Was it rolled out? Yes. patch#1 was landed at r52399, but it caused layout test failure on win (because of difference in console message of non-printable chars), so rolled out at r52402 by Adam Barth. patch#2 addressed the issue of the layout test failures by escaping non-printable characters in protocol string. 173983 12 45258 ap 2009-12-21 09:28:44 -0800 Comment on attachment 45258 Invalid url should raise SYNTAX_ERR exception. > +static WebCore::String encodeProtocolString(const WebCore::String& protocol) This is inside namespace WebCore, and doesn't need namespace prefixes. Please fix before landing. > + const UChar* characters = protocol.characters(); > + StringBuilder builder; > + for (size_t i = 0; i < protocol.length(); i++) { > + if (characters[i] < 0x20 || characters[i] > 0x7E) Why not just use protocol[i]? r=me 174164 13 ukai 2009-12-21 20:48:00 -0800 Committed r52478: <http://trac.webkit.org/changeset/52478> 45125 2009-12-17 22:58:34 -0800 2009-12-20 00:45:09 -0800 WebCore: Invalid url should raise SYNTAX_ERR exception. bug-32700-20091218155832.patch text/plain 8921 ukai ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMTQ2NDkyLi5hZWM0NTZlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTIt MTcgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW52YWxpZCB1cmwgc2hvdWxkIHJhaXNl IFNZTlRBWF9FUlIgZXhjZXB0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Jla2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzI3MDAKKworICAgICAgICAqIHdlYnNvY2tldC90ZXN0cy9iYWQtc3Vi LXByb3RvY29sLWV4cGVjdGVkLnR4dDogYWRkIENPTlNPTEUgTUVTU0FHRXMKKyAgICAgICAgKiB3 ZWJzb2NrZXQvdGVzdHMvc2NyaXB0LXRlc3RzL3VybC1wYXJzaW5nLmpzOiBhZGQgaW52YWxpZCB1 cmwgdGVzdHMuCisgICAgICAgICAgQWxzbyBjaGFuZ2VkIHVybCBmcm9tIHdzOi8vMTI3LjAuMC4x LyB0byB3czovLzEyNy4wLjAuMTo4ODgwL3dlYnNvY2tldC90ZXN0cy9zaW1wbGUgdG8gbWFrZSBp dCBzdXJlIG5vIGVycm9ycyBvbiBjb25zb2xlIG1lc3NhZ2UgZm9yIHRoZXNlIHRlc3RzIGJ5IG5v dCByZWNlaXZpbmcgdW5leHBlY3RlZCByZXNwb25zZSBmcm9tIDEyNy4wLjAuMTo4MC4KKyAgICAg ICAgKiB3ZWJzb2NrZXQvdGVzdHMvdXJsLXBhcnNpbmctZXhwZWN0ZWQudHh0OgorCiAyMDA5LTEy LTE3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZGhjcC0xNzItMjgtMTc0LTIyMC5zcGIuY29y cC5nb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnNvY2tldC90ZXN0cy9iYWQtc3ViLXByb3RvY29sLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3dlYnNvY2tldC90ZXN0cy9iYWQtc3ViLXByb3RvY29s LWV4cGVjdGVkLnR4dAppbmRleCAwYzJmY2RlLi4zMmUwMzc2IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy93ZWJzb2NrZXQvdGVzdHMvYmFkLXN1Yi1wcm90b2NvbC1leHBlY3RlZC50eHQKKysrIGIv TGF5b3V0VGVzdHMvd2Vic29ja2V0L3Rlc3RzL2JhZC1zdWItcHJvdG9jb2wtZXhwZWN0ZWQudHh0 CkBAIC0xLDMgKzEsMTQgQEAKK0NPTlNPTEUgTUVTU0FHRTogbGluZSAwOiBXcm9uZyBwcm90b2Nv bCBmb3IgV2ViU29ja2V0IAorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDA6IFdyb25nIHByb3RvY29s IGZvciBXZWJTb2NrZXQgCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogV3JvbmcgcHJvdG9jb2wg Zm9yIFdlYlNvY2tldCAJCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogV3JvbmcgcHJvdG9jb2wg Zm9yIFdlYlNvY2tldCAbCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogV3JvbmcgcHJvdG9jb2wg Zm9yIFdlYlNvY2tldCB/CitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogV3JvbmcgcHJvdG9jb2wg Zm9yIFdlYlNvY2tldCDCgAorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDA6IFdyb25nIHByb3RvY29s IGZvciBXZWJTb2NrZXQg44GCCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogV3JvbmcgcHJvdG9j b2wgZm9yIFdlYlNvY2tldCDvv78KK0NPTlNPTEUgTUVTU0FHRTogbGluZSAwOiBXcm9uZyBwcm90 b2NvbCBmb3IgV2ViU29ja2V0IAorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDA6IFdyb25nIHByb3Rv Y29sIGZvciBXZWJTb2NrZXQg77++CitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogV3JvbmcgcHJv dG9jb2wgZm9yIFdlYlNvY2tldCDwoICLCiBUZXN0IFdlYlNvY2tldCBiYWQgc3ViLXByb3RvY29s IG5hbWVzLgogCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1l c3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy93ZWJzb2NrZXQvdGVzdHMvc2NyaXB0LXRlc3RzL3VybC1wYXJzaW5nLmpzIGIvTGF5b3V0 VGVzdHMvd2Vic29ja2V0L3Rlc3RzL3NjcmlwdC10ZXN0cy91cmwtcGFyc2luZy5qcwppbmRleCA2 ZmRiMDM3Li5jNDZkOWUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy93ZWJzb2NrZXQvdGVzdHMv c2NyaXB0LXRlc3RzL3VybC1wYXJzaW5nLmpzCisrKyBiL0xheW91dFRlc3RzL3dlYnNvY2tldC90 ZXN0cy9zY3JpcHQtdGVzdHMvdXJsLXBhcnNpbmcuanMKQEAgLTEsMTYgKzEsMjIgQEAKIGRlc2Ny aXB0aW9uKCJUZXN0IFdlYlNvY2tldCBVUkwgcGFyc2luZy4iKTsKIAorLy8gSW52YWxpZCB1cmwg d2lsbCBmYWlsIHRvIGJlIHBhcnNlZC4KK3Nob3VsZFRocm93KCduZXcgV2ViU29ja2V0KCJ3czov L2phdmFzY3JpcHQ6YSIpJyk7CisKIC8vIENhbid0IHVzZSByZWxhdGl2ZSBVUkxzIC0gYmVjYXVz ZSBzcGVjIHNheXMgc28sIGFuZCBiZWNhdXNlIHRoZSBzY2hlbWUgaXMgZGlmZmVyZW50IGFueXdh eS4KIHNob3VsZFRocm93KCduZXcgV2ViU29ja2V0KCIvYXBwbGV0IiknKTsKIAorLy8gTm9uIHdz IFVSTCBpcyBub3QgYWxsb3dlZC4KK3Nob3VsZFRocm93KCduZXcgV2ViU29ja2V0KCJqYXZhc2Ny aXB0OmEiKScpOworCiAvLyBVQSBpcyBhbGxvd2VkIHRvIGJsb2NrIGFjY2VzcyB0byBzb21lIHBv cnRzLCB3aGljaCB3ZSBkby4KIHNob3VsZFRocm93KCduZXcgV2ViU29ja2V0KCJ3czovLzEyNy4w LjAuMToyNS8iKScpOwogCi0vLyBUaGlzIGlzIHdoYXQgd2UgY3VycmVudGx5IGRvLCBidXQgbm90 IHdoYXQgdGhlIHNwZWMgc2F5cyAoYXMgb2YgRWRpdG9yJ3MgRHJhZnQgMSBEZWNlbWJlciAyMDA5 KS4KLXNob3VsZEJlKCcobmV3IFdlYlNvY2tldCgid3M6Ly8xMjcuMC4wLjEvYS8uLi8iKSkuVVJM JywgJyJ3czovLzEyNy4wLjAuMS8iJyk7Ci0KLXNob3VsZEJlKCcobmV3IFdlYlNvY2tldCgid3M6 Ly8xMjcuMC4wLjEvcGF0aD8iKSkuVVJMJywgJyJ3czovLzEyNy4wLjAuMS9wYXRoPyInKTsKLXNo b3VsZEJlKCcobmV3IFdlYlNvY2tldCgid3M6Ly8xMjcuMC4wLjEvcGF0aD9rPXYiKSkuVVJMJywg JyJ3czovLzEyNy4wLjAuMS9wYXRoP2s9diInKTsKKy8vIFJlc29sdmUgdGhlIHVybCBzdHJpbmcg dXNpbmcgdGhlIHJlc29sdmUgYSBXZWIgYWRkcmVzcyBhbGdvcml0aG0uCisvLyBVc2UgMTI3LjAu MC4xOjg4ODAgYW5kIGV4aXN0aW5nIHdzIGhhbmRsZXIgdG8gbWFrZSBzdXJlIHdlIGRvbid0IHJl Y2VpdmUgdW5leHBlY3RlZCByZXNwb25zZSAoc28gbm8gY29uc29sZSBtZXNzYWdlIGFwcGVhcnMp CitzaG91bGRCZSgnKG5ldyBXZWJTb2NrZXQoIndzOi8vMTI3LjAuMC4xOjg4ODAvYS8uLi93ZWJz b2NrZXQvdGVzdHMvc2ltcGxlIikpLlVSTCcsICcid3M6Ly8xMjcuMC4wLjE6ODg4MC93ZWJzb2Nr ZXQvdGVzdHMvc2ltcGxlIicpOworc2hvdWxkQmUoJyhuZXcgV2ViU29ja2V0KCJ3czovLzEyNy4w LjAuMTo4ODgwL3dlYnNvY2tldC90ZXN0cy9zaW1wbGU/IikpLlVSTCcsICcid3M6Ly8xMjcuMC4w LjE6ODg4MC93ZWJzb2NrZXQvdGVzdHMvc2ltcGxlPyInKTsKK3Nob3VsZEJlKCcobmV3IFdlYlNv Y2tldCgid3M6Ly8xMjcuMC4wLjE6ODg4MC93ZWJzb2NrZXQvdGVzdHMvc2ltcGxlP2s9diIpKS5V UkwnLCAnIndzOi8vMTI3LjAuMC4xOjg4ODAvd2Vic29ja2V0L3Rlc3RzL3NpbXBsZT9rPXYiJyk7 CiAKIC8vIGRyYWZ0LWhpeGllLXRoZXdlYnNvY2tldHByb3RvY29sLTYwIHNheXMgSWYgL3VybC8g aGFzIGEgPGZyYWdtZW50PgogLy8gY29tcG9uZW50LCB0aGVuIGZhaWwgdGhlIHBhcnNpbmcgV2Vi IFNvY2tldCBVUkxzLCBzbyB0aHJvdyBhIFNZTlRBWF9FUlIKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL3dlYnNvY2tldC90ZXN0cy91cmwtcGFyc2luZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy93ZWJzb2NrZXQvdGVzdHMvdXJsLXBhcnNpbmctZXhwZWN0ZWQudHh0CmluZGV4IDgwZDc1NTcu LmNiZjQ0YzMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3dlYnNvY2tldC90ZXN0cy91cmwtcGFy c2luZy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvd2Vic29ja2V0L3Rlc3RzL3VybC1w YXJzaW5nLWV4cGVjdGVkLnR4dApAQCAtMSwxMiArMSwyMCBAQAorQ09OU09MRSBNRVNTQUdFOiBs aW5lIDA6IEludmFsaWQgdXJsIGZvciBXZWJTb2NrZXQgd3M6Ly9qYXZhc2NyaXB0OmEKK0NPTlNP TEUgTUVTU0FHRTogbGluZSAwOiBXcm9uZyB1cmwgc2NoZW1lIGZvciBXZWJTb2NrZXQgaHR0cDov LzEyNy4wLjAuMTo4ODgwL2FwcGxldAorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDA6IFdyb25nIHVy bCBzY2hlbWUgZm9yIFdlYlNvY2tldCBqYXZhc2NyaXB0OmEKK0NPTlNPTEUgTUVTU0FHRTogbGlu ZSAwOiBXZWJTb2NrZXQgcG9ydCAyNSBibG9ja2VkCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDog VVJMIGhhcyBmcmFnbWVudCBjb21wb25lbnQgd3M6Ly8xMjcuMC4wLjEvcGF0aCMKK0NPTlNPTEUg TUVTU0FHRTogbGluZSAwOiBVUkwgaGFzIGZyYWdtZW50IGNvbXBvbmVudCB3czovLzEyNy4wLjAu MS9wYXRoI2ZyYWdtZW50CiBUZXN0IFdlYlNvY2tldCBVUkwgcGFyc2luZy4KIAogT24gc3VjY2Vz cywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkg IlRFU1QgQ09NUExFVEUiLgogCitQQVNTIG5ldyBXZWJTb2NrZXQoIndzOi8vamF2YXNjcmlwdDph IikgdGhyZXcgZXhjZXB0aW9uIEVycm9yOiBTWU5UQVhfRVJSOiBET00gRXhjZXB0aW9uIDEyLgog UEFTUyBuZXcgV2ViU29ja2V0KCIvYXBwbGV0IikgdGhyZXcgZXhjZXB0aW9uIEVycm9yOiBTWU5U QVhfRVJSOiBET00gRXhjZXB0aW9uIDEyLgorUEFTUyBuZXcgV2ViU29ja2V0KCJqYXZhc2NyaXB0 OmEiKSB0aHJldyBleGNlcHRpb24gRXJyb3I6IFNZTlRBWF9FUlI6IERPTSBFeGNlcHRpb24gMTIu CiBQQVNTIG5ldyBXZWJTb2NrZXQoIndzOi8vMTI3LjAuMC4xOjI1LyIpIHRocmV3IGV4Y2VwdGlv biBFcnJvcjogU0VDVVJJVFlfRVJSOiBET00gRXhjZXB0aW9uIDE4LgotUEFTUyAobmV3IFdlYlNv Y2tldCgid3M6Ly8xMjcuMC4wLjEvYS8uLi8iKSkuVVJMIGlzICJ3czovLzEyNy4wLjAuMS8iCi1Q QVNTIChuZXcgV2ViU29ja2V0KCJ3czovLzEyNy4wLjAuMS9wYXRoPyIpKS5VUkwgaXMgIndzOi8v MTI3LjAuMC4xL3BhdGg/IgotUEFTUyAobmV3IFdlYlNvY2tldCgid3M6Ly8xMjcuMC4wLjEvcGF0 aD9rPXYiKSkuVVJMIGlzICJ3czovLzEyNy4wLjAuMS9wYXRoP2s9diIKK1BBU1MgKG5ldyBXZWJT b2NrZXQoIndzOi8vMTI3LjAuMC4xOjg4ODAvYS8uLi93ZWJzb2NrZXQvdGVzdHMvc2ltcGxlIikp LlVSTCBpcyAid3M6Ly8xMjcuMC4wLjE6ODg4MC93ZWJzb2NrZXQvdGVzdHMvc2ltcGxlIgorUEFT UyAobmV3IFdlYlNvY2tldCgid3M6Ly8xMjcuMC4wLjE6ODg4MC93ZWJzb2NrZXQvdGVzdHMvc2lt cGxlPyIpKS5VUkwgaXMgIndzOi8vMTI3LjAuMC4xOjg4ODAvd2Vic29ja2V0L3Rlc3RzL3NpbXBs ZT8iCitQQVNTIChuZXcgV2ViU29ja2V0KCJ3czovLzEyNy4wLjAuMTo4ODgwL3dlYnNvY2tldC90 ZXN0cy9zaW1wbGU/az12IikpLlVSTCBpcyAid3M6Ly8xMjcuMC4wLjE6ODg4MC93ZWJzb2NrZXQv dGVzdHMvc2ltcGxlP2s9diIKIFBBU1MgbmV3IFdlYlNvY2tldCgid3M6Ly8xMjcuMC4wLjEvcGF0 aCMiKSB0aHJldyBleGNlcHRpb24gRXJyb3I6IFNZTlRBWF9FUlI6IERPTSBFeGNlcHRpb24gMTIu CiBQQVNTIG5ldyBXZWJTb2NrZXQoIndzOi8vMTI3LjAuMC4xL3BhdGgjZnJhZ21lbnQiKSB0aHJl dyBleGNlcHRpb24gRXJyb3I6IFNZTlRBWF9FUlI6IERPTSBFeGNlcHRpb24gMTIuCiBQQVNTIHN1 Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBi L1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGY3ZjNjOWYuLjUxZDVjMjUgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMDktMTItMTcgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW52YWxpZCB1cmwgc2hv dWxkIHJhaXNlIFNZTlRBWF9FUlIgZXhjZXB0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI3MDAKKworICAgICAgICBDaGVjayB1cmwgaXMgdmFs aWQgaW4gV2ViU29ja2V0Ojpjb25uZWN0LgorICAgICAgICBBbHNvIGxvZyB0aGUgZGV0YWlsZWQg cmVhc29uIG9mIHdlYnNvY2tldCBmYWlsdXJlcyB0byBjb25zb2xlLgorCisgICAgICAgICogd2Vi c29ja2V0cy9XZWJTb2NrZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0Ojpjb25u ZWN0KToKKwogMjAwOS0xMi0xNyAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv d2Vic29ja2V0cy9XZWJTb2NrZXQuY3BwIGIvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldC5j cHAKaW5kZXggZWU3ODE3NC4uZDRmMTZhMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS93ZWJzb2NrZXRz L1dlYlNvY2tldC5jcHAKKysrIGIvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldC5jcHAKQEAg LTEwMSwyNiArMTAxLDMzIEBAIHZvaWQgV2ViU29ja2V0Ojpjb25uZWN0KGNvbnN0IEtVUkwmIHVy bCwgY29uc3QgU3RyaW5nJiBwcm90b2NvbCwgRXhjZXB0aW9uQ29kZSYKICAgICBtX3VybCA9IHVy bDsKICAgICBtX3Byb3RvY29sID0gcHJvdG9jb2w7CiAKKyAgICBpZiAoIW1fdXJsLmlzVmFsaWQo KSkgeworICAgICAgICBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmFkZE1lc3NhZ2UoQ29uc29s ZURlc3RpbmF0aW9uLCBKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJvck1lc3Nh Z2VMZXZlbCwgIkludmFsaWQgdXJsIGZvciBXZWJTb2NrZXQgIiArIHVybC5zdHJpbmcoKSwgMCwg c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5zZWN1cml0eU9yaWdpbigpLT50b1N0cmluZygpKTsK KyAgICAgICAgbV9zdGF0ZSA9IENMT1NFRDsKKyAgICAgICAgZWMgPSBTWU5UQVhfRVJSOworICAg ICAgICByZXR1cm47CisgICAgfQorCiAgICAgaWYgKCFtX3VybC5wcm90b2NvbElzKCJ3cyIpICYm ICFtX3VybC5wcm90b2NvbElzKCJ3c3MiKSkgewotICAgICAgICBMT0coTmV0d29yaywgIldyb25n IHVybCBzY2hlbWUgZm9yIFdlYlNvY2tldCAlcyIsIHVybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgp KTsKKyAgICAgICAgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5hZGRNZXNzYWdlKENvbnNvbGVE ZXN0aW5hdGlvbiwgSlNNZXNzYWdlU291cmNlLCBMb2dNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdl TGV2ZWwsICJXcm9uZyB1cmwgc2NoZW1lIGZvciBXZWJTb2NrZXQgIiArIHVybC5zdHJpbmcoKSwg MCwgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5zZWN1cml0eU9yaWdpbigpLT50b1N0cmluZygp KTsKICAgICAgICAgbV9zdGF0ZSA9IENMT1NFRDsKICAgICAgICAgZWMgPSBTWU5UQVhfRVJSOwog ICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmIChtX3VybC5oYXNGcmFnbWVudElkZW50aWZp ZXIoKSkgewotICAgICAgICBMT0coTmV0d29yaywgIlVSTCBoYXMgZnJhZ21lbnQgY29tcG9uZW50 ICVzIiwgdXJsLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBzY3JpcHRFeGVjdXRp b25Db250ZXh0KCktPmFkZE1lc3NhZ2UoQ29uc29sZURlc3RpbmF0aW9uLCBKU01lc3NhZ2VTb3Vy Y2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgIlVSTCBoYXMgZnJhZ21lbnQg Y29tcG9uZW50ICIgKyB1cmwuc3RyaW5nKCksIDAsIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+ c2VjdXJpdHlPcmlnaW4oKS0+dG9TdHJpbmcoKSk7CiAgICAgICAgIG1fc3RhdGUgPSBDTE9TRUQ7 CiAgICAgICAgIGVjID0gU1lOVEFYX0VSUjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBp ZiAoIWlzVmFsaWRQcm90b2NvbFN0cmluZyhtX3Byb3RvY29sKSkgewotICAgICAgICBMT0coTmV0 d29yaywgIldyb25nIHByb3RvY29sIGZvciBXZWJTb2NrZXQgJXMiLCBtX3Byb3RvY29sLnV0Zjgo KS5kYXRhKCkpOworICAgICAgICBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmFkZE1lc3NhZ2Uo Q29uc29sZURlc3RpbmF0aW9uLCBKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJv ck1lc3NhZ2VMZXZlbCwgIldyb25nIHByb3RvY29sIGZvciBXZWJTb2NrZXQgIiArIG1fcHJvdG9j b2wsIDAsIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+dG9TdHJp bmcoKSk7CiAgICAgICAgIG1fc3RhdGUgPSBDTE9TRUQ7CiAgICAgICAgIGVjID0gU1lOVEFYX0VS UjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoIXBvcnRBbGxvd2VkKHVybCkpIHsK LSAgICAgICAgTE9HKE5ldHdvcmssICJXZWJTb2NrZXQgcG9ydCAlZCBibG9ja2VkIiwgdXJsLnBv cnQoKSk7CisgICAgICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+YWRkTWVzc2FnZShDb25z b2xlRGVzdGluYXRpb24sIEpTTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVz c2FnZUxldmVsLCBTdHJpbmc6OmZvcm1hdCgiV2ViU29ja2V0IHBvcnQgJWQgYmxvY2tlZCIsIHVy bC5wb3J0KCkpLCAwLCBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnNlY3VyaXR5T3JpZ2luKCkt PnRvU3RyaW5nKCkpOwogICAgICAgICBtX3N0YXRlID0gQ0xPU0VEOwogICAgICAgICBlYyA9IFNF Q1VSSVRZX0VSUjsKICAgICAgICAgcmV0dXJuOwo= 45258 2009-12-20 00:45:15 -0800 2009-12-21 09:28:44 -0800 Invalid url should raise SYNTAX_ERR exception. bug-32700-20091220174513.patch text/plain 9913 ukai ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1YjNiZjRkLi4yNTBmNmJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTIt MjAgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW52YWxpZCB1cmwgc2hvdWxkIHJhaXNl IFNZTlRBWF9FUlIgZXhjZXB0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzI3MDAKKworICAgICAgICAqIHdlYnNvY2tldC90ZXN0cy9iYWQtc3Vi LXByb3RvY29sLWV4cGVjdGVkLnR4dDogYWRkIENPTlNPTEUgTUVTU0FHRXMKKyAgICAgICAgKiB3 ZWJzb2NrZXQvdGVzdHMvc2NyaXB0LXRlc3RzL3VybC1wYXJzaW5nLmpzOiBhZGQgaW52YWxpZCB1 cmwgdGVzdHMuCisgICAgICAgICAgQWxzbyBjaGFuZ2VkIHVybCBmcm9tIHdzOi8vMTI3LjAuMC4x LyB0byB3czovLzEyNy4wLjAuMTo4ODgwL3dlYnNvY2tldC90ZXN0cy9zaW1wbGUgdG8gbWFrZSBp dCBzdXJlIG5vIGVycm9ycyBvbiBjb25zb2xlIG1lc3NhZ2UgZm9yIHRoZXNlIHRlc3RzIGJ5IG5v dCByZWNlaXZpbmcgdW5leHBlY3RlZCByZXNwb25zZSBmcm9tIDEyNy4wLjAuMTo4MAorICAgICAg ICAqIHdlYnNvY2tldC90ZXN0cy91cmwtcGFyc2luZy1leHBlY3RlZC50eHQ6CisKIDIwMDktMTIt MTkgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBObyByZXZpZXcs IHJvbGxpbmcgb3V0IHI1MjM5OS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnNvY2tldC90 ZXN0cy9iYWQtc3ViLXByb3RvY29sLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3dlYnNvY2tl dC90ZXN0cy9iYWQtc3ViLXByb3RvY29sLWV4cGVjdGVkLnR4dAppbmRleCAwYzJmY2RlLi5mZDg4 NDAwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy93ZWJzb2NrZXQvdGVzdHMvYmFkLXN1Yi1wcm90 b2NvbC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvd2Vic29ja2V0L3Rlc3RzL2JhZC1z dWItcHJvdG9jb2wtZXhwZWN0ZWQudHh0CkBAIC0xLDMgKzEsMTQgQEAKK0NPTlNPTEUgTUVTU0FH RTogbGluZSAwOiBXcm9uZyBwcm90b2NvbCBmb3IgV2ViU29ja2V0ICcnCitDT05TT0xFIE1FU1NB R0U6IGxpbmUgMDogV3JvbmcgcHJvdG9jb2wgZm9yIFdlYlNvY2tldCAnXHUwMDAwJworQ09OU09M RSBNRVNTQUdFOiBsaW5lIDA6IFdyb25nIHByb3RvY29sIGZvciBXZWJTb2NrZXQgJ1x1MDAwOScK K0NPTlNPTEUgTUVTU0FHRTogbGluZSAwOiBXcm9uZyBwcm90b2NvbCBmb3IgV2ViU29ja2V0ICdc dTAwMUInCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogV3JvbmcgcHJvdG9jb2wgZm9yIFdlYlNv Y2tldCAnXHUwMDdGJworQ09OU09MRSBNRVNTQUdFOiBsaW5lIDA6IFdyb25nIHByb3RvY29sIGZv ciBXZWJTb2NrZXQgJ1x1MDA4MCcKK0NPTlNPTEUgTUVTU0FHRTogbGluZSAwOiBXcm9uZyBwcm90 b2NvbCBmb3IgV2ViU29ja2V0ICdcdTMwNDInCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogV3Jv bmcgcHJvdG9jb2wgZm9yIFdlYlNvY2tldCAnXHVGRkZGJworQ09OU09MRSBNRVNTQUdFOiBsaW5l IDA6IFdyb25nIHByb3RvY29sIGZvciBXZWJTb2NrZXQgJycKK0NPTlNPTEUgTUVTU0FHRTogbGlu ZSAwOiBXcm9uZyBwcm90b2NvbCBmb3IgV2ViU29ja2V0ICdcdUZGRkUnCitDT05TT0xFIE1FU1NB R0U6IGxpbmUgMDogV3JvbmcgcHJvdG9jb2wgZm9yIFdlYlNvY2tldCAnXHVEODQwXHVEQzBCJwog VGVzdCBXZWJTb2NrZXQgYmFkIHN1Yi1wcm90b2NvbCBuYW1lcy4KIAogT24gc3VjY2VzcywgeW91 IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1Qg Q09NUExFVEUiLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2Vic29ja2V0L3Rlc3RzL3Njcmlw dC10ZXN0cy91cmwtcGFyc2luZy5qcyBiL0xheW91dFRlc3RzL3dlYnNvY2tldC90ZXN0cy9zY3Jp cHQtdGVzdHMvdXJsLXBhcnNpbmcuanMKaW5kZXggNmZkYjAzNy4uYzQ2ZDllMSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvd2Vic29ja2V0L3Rlc3RzL3NjcmlwdC10ZXN0cy91cmwtcGFyc2luZy5q cworKysgYi9MYXlvdXRUZXN0cy93ZWJzb2NrZXQvdGVzdHMvc2NyaXB0LXRlc3RzL3VybC1wYXJz aW5nLmpzCkBAIC0xLDE2ICsxLDIyIEBACiBkZXNjcmlwdGlvbigiVGVzdCBXZWJTb2NrZXQgVVJM IHBhcnNpbmcuIik7CiAKKy8vIEludmFsaWQgdXJsIHdpbGwgZmFpbCB0byBiZSBwYXJzZWQuCitz aG91bGRUaHJvdygnbmV3IFdlYlNvY2tldCgid3M6Ly9qYXZhc2NyaXB0OmEiKScpOworCiAvLyBD YW4ndCB1c2UgcmVsYXRpdmUgVVJMcyAtIGJlY2F1c2Ugc3BlYyBzYXlzIHNvLCBhbmQgYmVjYXVz ZSB0aGUgc2NoZW1lIGlzIGRpZmZlcmVudCBhbnl3YXkuCiBzaG91bGRUaHJvdygnbmV3IFdlYlNv Y2tldCgiL2FwcGxldCIpJyk7CiAKKy8vIE5vbiB3cyBVUkwgaXMgbm90IGFsbG93ZWQuCitzaG91 bGRUaHJvdygnbmV3IFdlYlNvY2tldCgiamF2YXNjcmlwdDphIiknKTsKKwogLy8gVUEgaXMgYWxs b3dlZCB0byBibG9jayBhY2Nlc3MgdG8gc29tZSBwb3J0cywgd2hpY2ggd2UgZG8uCiBzaG91bGRU aHJvdygnbmV3IFdlYlNvY2tldCgid3M6Ly8xMjcuMC4wLjE6MjUvIiknKTsKIAotLy8gVGhpcyBp cyB3aGF0IHdlIGN1cnJlbnRseSBkbywgYnV0IG5vdCB3aGF0IHRoZSBzcGVjIHNheXMgKGFzIG9m IEVkaXRvcidzIERyYWZ0IDEgRGVjZW1iZXIgMjAwOSkuCi1zaG91bGRCZSgnKG5ldyBXZWJTb2Nr ZXQoIndzOi8vMTI3LjAuMC4xL2EvLi4vIikpLlVSTCcsICcid3M6Ly8xMjcuMC4wLjEvIicpOwot Ci1zaG91bGRCZSgnKG5ldyBXZWJTb2NrZXQoIndzOi8vMTI3LjAuMC4xL3BhdGg/IikpLlVSTCcs ICcid3M6Ly8xMjcuMC4wLjEvcGF0aD8iJyk7Ci1zaG91bGRCZSgnKG5ldyBXZWJTb2NrZXQoIndz Oi8vMTI3LjAuMC4xL3BhdGg/az12IikpLlVSTCcsICcid3M6Ly8xMjcuMC4wLjEvcGF0aD9rPXYi Jyk7CisvLyBSZXNvbHZlIHRoZSB1cmwgc3RyaW5nIHVzaW5nIHRoZSByZXNvbHZlIGEgV2ViIGFk ZHJlc3MgYWxnb3JpdGhtLgorLy8gVXNlIDEyNy4wLjAuMTo4ODgwIGFuZCBleGlzdGluZyB3cyBo YW5kbGVyIHRvIG1ha2Ugc3VyZSB3ZSBkb24ndCByZWNlaXZlIHVuZXhwZWN0ZWQgcmVzcG9uc2Ug KHNvIG5vIGNvbnNvbGUgbWVzc2FnZSBhcHBlYXJzKQorc2hvdWxkQmUoJyhuZXcgV2ViU29ja2V0 KCJ3czovLzEyNy4wLjAuMTo4ODgwL2EvLi4vd2Vic29ja2V0L3Rlc3RzL3NpbXBsZSIpKS5VUkwn LCAnIndzOi8vMTI3LjAuMC4xOjg4ODAvd2Vic29ja2V0L3Rlc3RzL3NpbXBsZSInKTsKK3Nob3Vs ZEJlKCcobmV3IFdlYlNvY2tldCgid3M6Ly8xMjcuMC4wLjE6ODg4MC93ZWJzb2NrZXQvdGVzdHMv c2ltcGxlPyIpKS5VUkwnLCAnIndzOi8vMTI3LjAuMC4xOjg4ODAvd2Vic29ja2V0L3Rlc3RzL3Np bXBsZT8iJyk7CitzaG91bGRCZSgnKG5ldyBXZWJTb2NrZXQoIndzOi8vMTI3LjAuMC4xOjg4ODAv d2Vic29ja2V0L3Rlc3RzL3NpbXBsZT9rPXYiKSkuVVJMJywgJyJ3czovLzEyNy4wLjAuMTo4ODgw L3dlYnNvY2tldC90ZXN0cy9zaW1wbGU/az12IicpOwogCiAvLyBkcmFmdC1oaXhpZS10aGV3ZWJz b2NrZXRwcm90b2NvbC02MCBzYXlzIElmIC91cmwvIGhhcyBhIDxmcmFnbWVudD4KIC8vIGNvbXBv bmVudCwgdGhlbiBmYWlsIHRoZSBwYXJzaW5nIFdlYiBTb2NrZXQgVVJMcywgc28gdGhyb3cgYSBT WU5UQVhfRVJSCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJzb2NrZXQvdGVzdHMvdXJsLXBh cnNpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvd2Vic29ja2V0L3Rlc3RzL3VybC1wYXJz aW5nLWV4cGVjdGVkLnR4dAppbmRleCA4MGQ3NTU3Li5jYmY0NGMzIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy93ZWJzb2NrZXQvdGVzdHMvdXJsLXBhcnNpbmctZXhwZWN0ZWQudHh0CisrKyBiL0xh eW91dFRlc3RzL3dlYnNvY2tldC90ZXN0cy91cmwtcGFyc2luZy1leHBlY3RlZC50eHQKQEAgLTEs MTIgKzEsMjAgQEAKK0NPTlNPTEUgTUVTU0FHRTogbGluZSAwOiBJbnZhbGlkIHVybCBmb3IgV2Vi U29ja2V0IHdzOi8vamF2YXNjcmlwdDphCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogV3Jvbmcg dXJsIHNjaGVtZSBmb3IgV2ViU29ja2V0IGh0dHA6Ly8xMjcuMC4wLjE6ODg4MC9hcHBsZXQKK0NP TlNPTEUgTUVTU0FHRTogbGluZSAwOiBXcm9uZyB1cmwgc2NoZW1lIGZvciBXZWJTb2NrZXQgamF2 YXNjcmlwdDphCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogV2ViU29ja2V0IHBvcnQgMjUgYmxv Y2tlZAorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDA6IFVSTCBoYXMgZnJhZ21lbnQgY29tcG9uZW50 IHdzOi8vMTI3LjAuMC4xL3BhdGgjCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogVVJMIGhhcyBm cmFnbWVudCBjb21wb25lbnQgd3M6Ly8xMjcuMC4wLjEvcGF0aCNmcmFnbWVudAogVGVzdCBXZWJT b2NrZXQgVVJMIHBhcnNpbmcuCiAKIE9uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBv ZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KIAorUEFTUyBu ZXcgV2ViU29ja2V0KCJ3czovL2phdmFzY3JpcHQ6YSIpIHRocmV3IGV4Y2VwdGlvbiBFcnJvcjog U1lOVEFYX0VSUjogRE9NIEV4Y2VwdGlvbiAxMi4KIFBBU1MgbmV3IFdlYlNvY2tldCgiL2FwcGxl dCIpIHRocmV3IGV4Y2VwdGlvbiBFcnJvcjogU1lOVEFYX0VSUjogRE9NIEV4Y2VwdGlvbiAxMi4K K1BBU1MgbmV3IFdlYlNvY2tldCgiamF2YXNjcmlwdDphIikgdGhyZXcgZXhjZXB0aW9uIEVycm9y OiBTWU5UQVhfRVJSOiBET00gRXhjZXB0aW9uIDEyLgogUEFTUyBuZXcgV2ViU29ja2V0KCJ3czov LzEyNy4wLjAuMToyNS8iKSB0aHJldyBleGNlcHRpb24gRXJyb3I6IFNFQ1VSSVRZX0VSUjogRE9N IEV4Y2VwdGlvbiAxOC4KLVBBU1MgKG5ldyBXZWJTb2NrZXQoIndzOi8vMTI3LjAuMC4xL2EvLi4v IikpLlVSTCBpcyAid3M6Ly8xMjcuMC4wLjEvIgotUEFTUyAobmV3IFdlYlNvY2tldCgid3M6Ly8x MjcuMC4wLjEvcGF0aD8iKSkuVVJMIGlzICJ3czovLzEyNy4wLjAuMS9wYXRoPyIKLVBBU1MgKG5l dyBXZWJTb2NrZXQoIndzOi8vMTI3LjAuMC4xL3BhdGg/az12IikpLlVSTCBpcyAid3M6Ly8xMjcu MC4wLjEvcGF0aD9rPXYiCitQQVNTIChuZXcgV2ViU29ja2V0KCJ3czovLzEyNy4wLjAuMTo4ODgw L2EvLi4vd2Vic29ja2V0L3Rlc3RzL3NpbXBsZSIpKS5VUkwgaXMgIndzOi8vMTI3LjAuMC4xOjg4 ODAvd2Vic29ja2V0L3Rlc3RzL3NpbXBsZSIKK1BBU1MgKG5ldyBXZWJTb2NrZXQoIndzOi8vMTI3 LjAuMC4xOjg4ODAvd2Vic29ja2V0L3Rlc3RzL3NpbXBsZT8iKSkuVVJMIGlzICJ3czovLzEyNy4w LjAuMTo4ODgwL3dlYnNvY2tldC90ZXN0cy9zaW1wbGU/IgorUEFTUyAobmV3IFdlYlNvY2tldCgi d3M6Ly8xMjcuMC4wLjE6ODg4MC93ZWJzb2NrZXQvdGVzdHMvc2ltcGxlP2s9diIpKS5VUkwgaXMg IndzOi8vMTI3LjAuMC4xOjg4ODAvd2Vic29ja2V0L3Rlc3RzL3NpbXBsZT9rPXYiCiBQQVNTIG5l dyBXZWJTb2NrZXQoIndzOi8vMTI3LjAuMC4xL3BhdGgjIikgdGhyZXcgZXhjZXB0aW9uIEVycm9y OiBTWU5UQVhfRVJSOiBET00gRXhjZXB0aW9uIDEyLgogUEFTUyBuZXcgV2ViU29ja2V0KCJ3czov LzEyNy4wLjAuMS9wYXRoI2ZyYWdtZW50IikgdGhyZXcgZXhjZXB0aW9uIEVycm9yOiBTWU5UQVhf RVJSOiBET00gRXhjZXB0aW9uIDEyLgogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5 NDBlYjNlLi5mZTc1MGUwIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDA5LTEyLTIwICBGdW1pdG9zaGkgVWth aSAgPHVrYWlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEludmFsaWQgdXJsIHNob3VsZCByYWlzZSBTWU5UQVhfRVJSIGV4Y2Vw dGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMy NzAwCisKKyAgICAgICAgQ2hlY2sgdXJsIGlzIHZhbGlkIGluIFdlYlNvY2tldDo6Y29ubmVjdC4K KyAgICAgICAgQWxzbyBsb2cgdGhlIGRldGFpbGVkIHJlYXNvbiBvZiB3ZWJzb2NrZXQgZmFpbHVy ZXMgdG8gY29uc29sZS4KKworICAgICAgICAqIHdlYnNvY2tldHMvV2ViU29ja2V0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmVuY29kZVByb3RvY29sU3RyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6 OldlYlNvY2tldDo6Y29ubmVjdCk6CisKIDIwMDktMTItMTkgIEVyaWMgU2VpZGVsICA8ZXJpY0B3 ZWJraXQub3JnPgogCiAgICAgICAgIE5vIHJldmlldywgcm9sbGluZyBvdXQgcjUyMzk1LgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldC5jcHAgYi9XZWJDb3JlL3dlYnNv Y2tldHMvV2ViU29ja2V0LmNwcAppbmRleCBlZTc4MTc0Li5iNGE3YmEzIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0LmNwcAorKysgYi9XZWJDb3JlL3dlYnNvY2tldHMv V2ViU29ja2V0LmNwcApAQCAtNDMsNiArNDMsNyBAQAogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNp bmNsdWRlICJNZXNzYWdlRXZlbnQuaCIKICNpbmNsdWRlICJTY3JpcHRFeGVjdXRpb25Db250ZXh0 LmgiCisjaW5jbHVkZSAiU3RyaW5nQnVpbGRlci5oIgogI2luY2x1ZGUgIldlYlNvY2tldENoYW5u ZWwuaCIKICNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CiAKQEAgLTYyLDYgKzYzLDIxIEBA IHN0YXRpYyBib29sIGlzVmFsaWRQcm90b2NvbFN0cmluZyhjb25zdCBXZWJDb3JlOjpTdHJpbmcm IHByb3RvY29sKQogICAgIHJldHVybiB0cnVlOwogfQogCitzdGF0aWMgV2ViQ29yZTo6U3RyaW5n IGVuY29kZVByb3RvY29sU3RyaW5nKGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgcHJvdG9jb2wpCit7 CisgICAgY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMgPSBwcm90b2NvbC5jaGFyYWN0ZXJzKCk7Cisg ICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcHJv dG9jb2wubGVuZ3RoKCk7IGkrKykgeworICAgICAgICBpZiAoY2hhcmFjdGVyc1tpXSA8IDB4MjAg fHwgY2hhcmFjdGVyc1tpXSA+IDB4N0UpCisgICAgICAgICAgICBidWlsZGVyLmFwcGVuZChTdHJp bmc6OmZvcm1hdCgiXFx1JTA0WCIsIGNoYXJhY3RlcnNbaV0pKTsKKyAgICAgICAgZWxzZSBpZiAo Y2hhcmFjdGVyc1tpXSA9PSAweDVjKQorICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoIlxcXFwi KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoY2hhcmFjdGVyc1tp XSk7CisgICAgfQorICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7Cit9CisKICNpZiBVU0Uo VjgpCiAKIHN0YXRpYyBib29sIHdlYlNvY2tldHNBdmFpbGFibGUgPSBmYWxzZTsKQEAgLTEwMSwy NiArMTE3LDMzIEBAIHZvaWQgV2ViU29ja2V0Ojpjb25uZWN0KGNvbnN0IEtVUkwmIHVybCwgY29u c3QgU3RyaW5nJiBwcm90b2NvbCwgRXhjZXB0aW9uQ29kZSYKICAgICBtX3VybCA9IHVybDsKICAg ICBtX3Byb3RvY29sID0gcHJvdG9jb2w7CiAKKyAgICBpZiAoIW1fdXJsLmlzVmFsaWQoKSkgewor ICAgICAgICBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmFkZE1lc3NhZ2UoQ29uc29sZURlc3Rp bmF0aW9uLCBKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZl bCwgIkludmFsaWQgdXJsIGZvciBXZWJTb2NrZXQgIiArIHVybC5zdHJpbmcoKSwgMCwgc2NyaXB0 RXhlY3V0aW9uQ29udGV4dCgpLT5zZWN1cml0eU9yaWdpbigpLT50b1N0cmluZygpKTsKKyAgICAg ICAgbV9zdGF0ZSA9IENMT1NFRDsKKyAgICAgICAgZWMgPSBTWU5UQVhfRVJSOworICAgICAgICBy ZXR1cm47CisgICAgfQorCiAgICAgaWYgKCFtX3VybC5wcm90b2NvbElzKCJ3cyIpICYmICFtX3Vy bC5wcm90b2NvbElzKCJ3c3MiKSkgewotICAgICAgICBMT0coTmV0d29yaywgIldyb25nIHVybCBz Y2hlbWUgZm9yIFdlYlNvY2tldCAlcyIsIHVybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAg ICAgICAgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5hZGRNZXNzYWdlKENvbnNvbGVEZXN0aW5h dGlvbiwgSlNNZXNzYWdlU291cmNlLCBMb2dNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWws ICJXcm9uZyB1cmwgc2NoZW1lIGZvciBXZWJTb2NrZXQgIiArIHVybC5zdHJpbmcoKSwgMCwgc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCgpLT5zZWN1cml0eU9yaWdpbigpLT50b1N0cmluZygpKTsKICAg ICAgICAgbV9zdGF0ZSA9IENMT1NFRDsKICAgICAgICAgZWMgPSBTWU5UQVhfRVJSOwogICAgICAg ICByZXR1cm47CiAgICAgfQogICAgIGlmIChtX3VybC5oYXNGcmFnbWVudElkZW50aWZpZXIoKSkg ewotICAgICAgICBMT0coTmV0d29yaywgIlVSTCBoYXMgZnJhZ21lbnQgY29tcG9uZW50ICVzIiwg dXJsLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBzY3JpcHRFeGVjdXRpb25Db250 ZXh0KCktPmFkZE1lc3NhZ2UoQ29uc29sZURlc3RpbmF0aW9uLCBKU01lc3NhZ2VTb3VyY2UsIExv Z01lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgIlVSTCBoYXMgZnJhZ21lbnQgY29tcG9u ZW50ICIgKyB1cmwuc3RyaW5nKCksIDAsIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+c2VjdXJp dHlPcmlnaW4oKS0+dG9TdHJpbmcoKSk7CiAgICAgICAgIG1fc3RhdGUgPSBDTE9TRUQ7CiAgICAg ICAgIGVjID0gU1lOVEFYX0VSUjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoIWlz VmFsaWRQcm90b2NvbFN0cmluZyhtX3Byb3RvY29sKSkgewotICAgICAgICBMT0coTmV0d29yaywg Ildyb25nIHByb3RvY29sIGZvciBXZWJTb2NrZXQgJXMiLCBtX3Byb3RvY29sLnV0ZjgoKS5kYXRh KCkpOworICAgICAgICBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmFkZE1lc3NhZ2UoQ29uc29s ZURlc3RpbmF0aW9uLCBKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJvck1lc3Nh Z2VMZXZlbCwgIldyb25nIHByb3RvY29sIGZvciBXZWJTb2NrZXQgJyIgKyBlbmNvZGVQcm90b2Nv bFN0cmluZyhtX3Byb3RvY29sKSArICInIiwgMCwgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5z ZWN1cml0eU9yaWdpbigpLT50b1N0cmluZygpKTsKICAgICAgICAgbV9zdGF0ZSA9IENMT1NFRDsK ICAgICAgICAgZWMgPSBTWU5UQVhfRVJSOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlm ICghcG9ydEFsbG93ZWQodXJsKSkgewotICAgICAgICBMT0coTmV0d29yaywgIldlYlNvY2tldCBw b3J0ICVkIGJsb2NrZWQiLCB1cmwucG9ydCgpKTsKKyAgICAgICAgc2NyaXB0RXhlY3V0aW9uQ29u dGV4dCgpLT5hZGRNZXNzYWdlKENvbnNvbGVEZXN0aW5hdGlvbiwgSlNNZXNzYWdlU291cmNlLCBM b2dNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIFN0cmluZzo6Zm9ybWF0KCJXZWJTb2Nr ZXQgcG9ydCAlZCBibG9ja2VkIiwgdXJsLnBvcnQoKSksIDAsIHNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+dG9TdHJpbmcoKSk7CiAgICAgICAgIG1fc3RhdGUgPSBD TE9TRUQ7CiAgICAgICAgIGVjID0gU0VDVVJJVFlfRVJSOwogICAgICAgICByZXR1cm47Cg==