56582 2011-03-17 12:58:57 -0700 Update CSP directive parser to match spec 2011-03-17 18:58:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 53572 1 abarth abarth commit-queue oldest_to_newest 369230 0 abarth 2011-03-17 12:58:57 -0700 Update CSP directive parser to match spec 369232 1 86084 abarth 2011-03-17 13:01:12 -0700 Created attachment 86084 Patch 369384 2 86084 eric 2011-03-17 16:19:39 -0700 Comment on attachment 86084 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86084&action=review Looks reasonable. > Source/WebCore/page/ContentSecurityPolicy.cpp:42 > +static void advanceUntil(const UChar*& pos, const UChar* end, UChar delimiter) I take it you don't need to return success vs. failure here? 369386 3 abarth 2011-03-17 16:20:45 -0700 (In reply to comment #2) > (From update of attachment 86084 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=86084&action=review > > Looks reasonable. > > > Source/WebCore/page/ContentSecurityPolicy.cpp:42 > > +static void advanceUntil(const UChar*& pos, const UChar* end, UChar delimiter) > > I take it you don't need to return success vs. failure here? Nope. It just eats everything until ";" or END, so there can't be an error. 369471 4 86084 commit-queue 2011-03-17 18:58:35 -0700 Comment on attachment 86084 Patch Clearing flags on attachment: 86084 Committed r81425: <http://trac.webkit.org/changeset/81425> 369472 5 commit-queue 2011-03-17 18:58:40 -0700 All reviewed patches have been landed. Closing bug. 86084 2011-03-17 13:01:12 -0700 2011-03-17 18:58:34 -0700 Patch bug-56582-20110317130111.patch text/plain 8709 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogODEzNjUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmNGFmODc5MWQ0NGJmYWU0YzAyZGMw MGVjYzE4M2YwZDRiZDA4ZGJhLi5kMWNiMjE0MWVjMDRhZjk3OWU2MDI1NDZlZWU1MGM1MTNhNDIy NGYyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMtMTcgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVcGRhdGUgQ1NQIGRpcmVjdGl2ZSBwYXJzZXIgdG8gbWF0Y2ggc3BlYworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY1ODIKKworICAgICAg ICBUZXN0IHNvbWUgZXJyb3ItaGFuZGxpbmcgY2FzZXMuCisKKyAgICAgICAgKiBodHRwL3Rlc3Rz L3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9kaXJlY3RpdmUtcGFyc2luZy1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3Vy aXR5UG9saWN5L2RpcmVjdGl2ZS1wYXJzaW5nLmh0bWw6IEFkZGVkLgorCiAyMDExLTAzLTE3ICBB ZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNhYmxlIGh0dHAvdGVz dHMvaW5zcGVjdG9yL3Jlc291cmNlLXBhcmFtZXRlcnMuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvZGlyZWN0aXZl LXBhcnNpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9j b250ZW50U2VjdXJpdHlQb2xpY3kvZGlyZWN0aXZlLXBhcnNpbmctZXhwZWN0ZWQudHh0Cm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjRlZGQxNzk3YjNlZDBjNDA3YmNjNjNmYjU4NmI0MDgwMjk0MDNmYjkKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0 eVBvbGljeS9kaXJlY3RpdmUtcGFyc2luZy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxOCBAQAor Tm9uZSBvZiB0aGVzZSBzY3JpcHRzIHNob3VsZCBleGVjdXRlIGV2ZW4gdGhvdWdoIHRoZXJlIGFy ZSBwYXJzZSBlcnJvcnMgaW4gdGhlIHBvbGljeS4KKworICAgCisKKy0tLS0tLS0tCitGcmFtZTog JzwhLS1mcmFtZVBhdGggLy88IS0tZnJhbWUwLS0+LS0+JworLS0tLS0tLS0KK1BBU1MKKworLS0t LS0tLS0KK0ZyYW1lOiAnPCEtLWZyYW1lUGF0aCAvLzwhLS1mcmFtZTEtLT4tLT4nCistLS0tLS0t LQorUEFTUworCistLS0tLS0tLQorRnJhbWU6ICc8IS0tZnJhbWVQYXRoIC8vPCEtLWZyYW1lMi0t Pi0tPicKKy0tLS0tLS0tCitQQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9kaXJlY3RpdmUtcGFyc2luZy5odG1sIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvZGly ZWN0aXZlLXBhcnNpbmcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42OGFlMzEzOWU0NWZiMzg2MzAzZGE2Mjk1 MGNhZWVmY2M3NTg3MmM2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvZGlyZWN0aXZlLXBhcnNpbmcuaHRtbApA QCAtMCwwICsxLDE5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0 PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICBsYXlvdXRUZXN0Q29udHJv bGxlci5kdW1wQXNUZXh0KCk7CisgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBDaGlsZEZyYW1l c0FzVGV4dCgpOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgPHA+CisgICAgTm9u ZSBvZiB0aGVzZSBzY3JpcHRzIHNob3VsZCBleGVjdXRlIGV2ZW4gdGhvdWdoIHRoZXJlIGFyZSBw YXJzZSBlcnJvcnMgaW4gdGhlIHBvbGljeS4KKyAgPC9wPgorICA8aWZyYW1lIHNyYz0iaHR0cDov LzEyNy4wLjAuMTo4MDAwL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXNvdXJjZXMv ZWNoby1zY3JpcHQtc3JjLnBsP3Nob3VsZF9ydW49bm8mcT1odHRwOi8vMTI3LjAuMC4xOjgwMDAv c2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3Jlc291cmNlcy9zY3JpcHQuanMmY3NwPWFs bG93JTIwKiUzQiUyMHNjcmlwdC1zcmMlMjAnbm9uZSclM0IlMjAlMjAlM0IlMjAiPjwvaWZyYW1l PgorICA8aWZyYW1lIHNyYz0iaHR0cDovLzEyNy4wLjAuMTo4MDAwL3NlY3VyaXR5L2NvbnRlbnRT ZWN1cml0eVBvbGljeS9yZXNvdXJjZXMvZWNoby1zY3JpcHQtc3JjLnBsP3Nob3VsZF9ydW49bm8m cT1odHRwOi8vMTI3LjAuMC4xOjgwMDAvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3Jl c291cmNlcy9zY3JpcHQuanMmY3NwPXNjcmlwdC1zcmMlMjAnbm9uZSclM0IlMjBhYWElMjAlM0Il MjAiPjwvaWZyYW1lPgorICA8aWZyYW1lIHNyYz0iaHR0cDovLzEyNy4wLjAuMTo4MDAwL3NlY3Vy aXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXNvdXJjZXMvZWNoby1zY3JpcHQtc3JjLnBsP3No b3VsZF9ydW49bm8mcT1odHRwOi8vMTI3LjAuMC4xOjgwMDAvc2VjdXJpdHkvY29udGVudFNlY3Vy aXR5UG9saWN5L3Jlc291cmNlcy9zY3JpcHQuanMmY3NwPXNjcmlwdC1zcmMlMjAnbm9uZSclM0Il MjBhJTA3YWElMjAlM0IlMjAiPjwvaWZyYW1lPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IGFiYzk1NWM4MWUwMTk2NWEzZGUwMTg5MWZiNzg4YjkxZjQxNjFkNzQuLjhkMTY0M2IzMjI3 MjM0MGMwMWYyODZjMTNiOGFkNWVmY2IwNjU1MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBA QAorMjAxMS0wMy0xNyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBDU1AgZGlyZWN0 aXZlIHBhcnNlciB0byBtYXRjaCBzcGVjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01NjU4MgorCisgICAgICAgIEJyYW5kb24gdXBkYXRlZCB0aGUgQ1NQ IHNwZWMuICBJJ3ZlIHVwZGF0ZWQgb3VyIGltcGxlbWVudGF0aW9uIHRvCisgICAgICAgIG1hdGNo LiAgSW4gdGhlIHByb2Nlc3MsIEkgZm91bmQgYSBjb3VwbGUgYnVncyBpbiB0aGUgc3BlYywgd2hp Y2ggSSd2ZQorICAgICAgICBzZW50IHRvIHRoZSB3b3JraW5nIGdyb3VwLiAgVGhpcyBwYXRjaCBh c3N1bWVzIHRoYXQgdGhlIGJ1Z3Mgd2lsbCBiZQorICAgICAgICBmaXhlZCBpbiB0aGUgd2F5IEkg c3VnZ2VzdGVkLiAgSWYgdGhleSBnZXQgZml4ZWQgYSBkaWZmZXJlbnQgd2F5LCB3ZQorICAgICAg ICBtaWdodCBuZWVkIHRvIHVwZGF0ZSB0aGUgcGFyc2VyIGFnYWluLgorCisgICAgICAgIFRlc3Q6 IGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2RpcmVjdGl2ZS1wYXJz aW5nLmh0bWwKKworICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmlzRGlyZWN0aXZlTmFtZUNoYXJhY3Rlcik6CisgICAgICAgIChXZWJD b3JlOjppc0RpcmVjdGl2ZVZhbHVlQ2hhcmFjdGVyKToKKyAgICAgICAgKFdlYkNvcmU6OmFkdmFu Y2VVbnRpbCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OnBhcnNl KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6cGFyc2VEaXJlY3Rp dmUpOgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisKIDIwMTEtMDMt MTcgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4MTM1MC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv Q29udGVudFNlY3VyaXR5UG9saWN5LmNwcAppbmRleCA5N2NkNDQ3MGVjYjk2MTIwMDc3MWM4ZTZl OGI0YTY1M2RkOTVmOWI3Li4wZWIxNzA5NWQ5NGQ3NGEzNmVhNWM0ZDI0YTUzYmM0OWUwYmJlZDdh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCkBA IC0yOSw2ICsyOSwyNCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0YXRpYyBib29sIGlz RGlyZWN0aXZlTmFtZUNoYXJhY3RlcihVQ2hhciBjKQoreworICAgIHJldHVybiBpc0FTQ0lJQWxw aGEoYykgfHwgaXNBU0NJSURpZ2l0KGMpIHx8IGMgPT0gJy0nOworfQorCitzdGF0aWMgYm9vbCBp c0RpcmVjdGl2ZVZhbHVlQ2hhcmFjdGVyKFVDaGFyIGMpCit7CisgICAgcmV0dXJuIGlzQVNDSUlT cGFjZShjKSB8fCAoYyA+PSAweDIxICYmIGMgPD0gMHg3ZSk7IC8vIFdoaXRlc3BhY2UgKyBWQ0hB UgorfQorCitzdGF0aWMgdm9pZCBhZHZhbmNlVW50aWwoY29uc3QgVUNoYXIqJiBwb3MsIGNvbnN0 IFVDaGFyKiBlbmQsIFVDaGFyIGRlbGltaXRlcikKK3sKKyAgICB3aGlsZSAocG9zIDwgZW5kKSB7 CisgICAgICAgIGlmICgqcG9zKysgPT0gZGVsaW1pdGVyKQorICAgICAgICAgICAgcmV0dXJuOwor ICAgIH0KK30KKwogY2xhc3MgQ1NQRGlyZWN0aXZlIHsKIHB1YmxpYzoKICAgICBleHBsaWNpdCBD U1BEaXJlY3RpdmUoY29uc3QgU3RyaW5nJiB2YWx1ZSkKQEAgLTg3LDcgKzEwNSw4IEBAIHZvaWQg Q29udGVudFNlY3VyaXR5UG9saWN5OjpwYXJzZShjb25zdCBTdHJpbmcmIHBvbGljeSkKICAgICAg ICAgVmVjdG9yPFVDaGFyLCAzMj4gbmFtZTsKICAgICAgICAgVmVjdG9yPFVDaGFyLCA2ND4gdmFs dWU7CiAKLSAgICAgICAgcGFyc2VEaXJlY3RpdmUocG9zLCBlbmQsIG5hbWUsIHZhbHVlKTsKKyAg ICAgICAgaWYgKCFwYXJzZURpcmVjdGl2ZShwb3MsIGVuZCwgbmFtZSwgdmFsdWUpKQorICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIGlmIChuYW1lLmlzRW1wdHkoKSkKICAgICAgICAgICAg IGNvbnRpbnVlOwogCkBAIC05OCw0NyArMTE3LDU1IEBAIHZvaWQgQ29udGVudFNlY3VyaXR5UG9s aWN5OjpwYXJzZShjb25zdCBTdHJpbmcmIHBvbGljeSkKICAgICB9CiB9CiAKLXZvaWQgQ29udGVu dFNlY3VyaXR5UG9saWN5OjpwYXJzZURpcmVjdGl2ZShjb25zdCBVQ2hhciomIHBvcywgY29uc3Qg VUNoYXIqIGVuZCwgVmVjdG9yPFVDaGFyLCAzMj4mIG5hbWUsIFZlY3RvcjxVQ2hhciwgNjQ+JiB2 YWx1ZSkKK2Jvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjpwYXJzZURpcmVjdGl2ZShjb25zdCBV Q2hhciomIHBvcywgY29uc3QgVUNoYXIqIGVuZCwgVmVjdG9yPFVDaGFyLCAzMj4mIG5hbWUsIFZl Y3RvcjxVQ2hhciwgNjQ+JiB2YWx1ZSkKIHsKICAgICBBU1NFUlQocG9zIDwgZW5kKTsKICAgICBB U1NFUlQobmFtZS5pc0VtcHR5KCkpOwogICAgIEFTU0VSVCh2YWx1ZS5pc0VtcHR5KCkpOwogCi0g ICAgZW51bSB7Ci0gICAgICAgIEJlZm9yZURpcmVjdGl2ZU5hbWUsCi0gICAgICAgIERpcmVjdGl2 ZU5hbWUsCi0gICAgICAgIEFmdGVyRGlyZWN0aXZlTmFtZSwKLSAgICAgICAgRGlyZWN0aXZlVmFs dWUsCi0gICAgfSBzdGF0ZSA9IEJlZm9yZURpcmVjdGl2ZU5hbWU7CisgICAgd2hpbGUgKHBvcyA8 IGVuZCAmJiBpc0FTQ0lJU3BhY2UoKnBvcykpCisgICAgICAgIHBvcysrOwogCiAgICAgd2hpbGUg KHBvcyA8IGVuZCkgewotICAgICAgICBVQ2hhciBjdXJyZW50Q2hhcmFjdGVyID0gKnBvcysrOwot ICAgICAgICBzd2l0Y2ggKHN0YXRlKSB7Ci0gICAgICAgIGNhc2UgQmVmb3JlRGlyZWN0aXZlTmFt ZToKLSAgICAgICAgICAgIGlmIChpc0FTQ0lJU3BhY2UoY3VycmVudENoYXJhY3RlcikpCi0gICAg ICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBzdGF0ZSA9IERpcmVjdGl2ZU5hbWU7 Ci0gICAgICAgICAgICAvLyBGYWxsIHRocm91Z2guCi0gICAgICAgIGNhc2UgRGlyZWN0aXZlTmFt ZToKLSAgICAgICAgICAgIGlmICghaXNBU0NJSVNwYWNlKGN1cnJlbnRDaGFyYWN0ZXIpKSB7Ci0g ICAgICAgICAgICAgICAgbmFtZS5hcHBlbmQoY3VycmVudENoYXJhY3Rlcik7Ci0gICAgICAgICAg ICAgICAgY29udGludWU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBzdGF0ZSA9IEFmdGVy RGlyZWN0aXZlTmFtZTsKLSAgICAgICAgICAgIC8vIEZhbGwgdGhyb3VnaC4KLSAgICAgICAgY2Fz ZSBBZnRlckRpcmVjdGl2ZU5hbWU6Ci0gICAgICAgICAgICBpZiAoaXNBU0NJSVNwYWNlKGN1cnJl bnRDaGFyYWN0ZXIpKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgc3Rh dGUgPSBEaXJlY3RpdmVWYWx1ZTsKLSAgICAgICAgICAgIC8vIEZhbGwgdGhyb3VnaC4KLSAgICAg ICAgY2FzZSBEaXJlY3RpdmVWYWx1ZToKLSAgICAgICAgICAgIGlmIChjdXJyZW50Q2hhcmFjdGVy ICE9ICc7JykgewotICAgICAgICAgICAgICAgIHZhbHVlLmFwcGVuZChjdXJyZW50Q2hhcmFjdGVy KTsKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgVUNoYXIgY3VycmVudENoYXJhY3RlciA9ICpwb3M7CisgICAgICAg IGlmIChjdXJyZW50Q2hhcmFjdGVyID09ICc7JykKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICBpZiAoaXNBU0NJSVNwYWNlKGN1cnJlbnRDaGFyYWN0ZXIpKQorICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIGlmICghaXNEaXJlY3RpdmVOYW1lQ2hhcmFjdGVyKGN1cnJlbnRDaGFyYWN0ZXIp KSB7CisgICAgICAgICAgICBhZHZhbmNlVW50aWwocG9zLCBlbmQsICc7Jyk7CisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICAgICAgbmFtZS5hcHBlbmQoY3VycmVudENo YXJhY3Rlcik7CisgICAgICAgIHBvcysrOworICAgIH0KKworICAgIHdoaWxlIChwb3MgPCBlbmQg JiYgaXNBU0NJSVNwYWNlKCpwb3MpKQorICAgICAgICBwb3MrKzsKKworICAgIGlmIChwb3MgPCBl bmQgJiYgKnBvcyA9PSAnOycpIHsKKyAgICAgICAgcG9zKys7CisgICAgICAgIHJldHVybiB0cnVl OworICAgIH0KKworICAgIHdoaWxlIChwb3MgPCBlbmQpIHsKKyAgICAgICAgVUNoYXIgY3VycmVu dENoYXJhY3RlciA9ICpwb3M7CisgICAgICAgIGlmIChjdXJyZW50Q2hhcmFjdGVyID09ICc7JykK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBpZiAoIWlzRGlyZWN0aXZlVmFsdWVDaGFyYWN0 ZXIoY3VycmVudENoYXJhY3RlcikpIHsKKyAgICAgICAgICAgIGFkdmFuY2VVbnRpbChwb3MsIGVu ZCwgJzsnKTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQorICAgICAgICB2 YWx1ZS5hcHBlbmQoY3VycmVudENoYXJhY3Rlcik7CisgICAgICAgIHBvcysrOwogICAgIH0KKwor ICAgIGlmIChwb3MgPCBlbmQgJiYgKnBvcyA9PSAnOycpIHsKKyAgICAgICAgcG9zKys7CisgICAg ICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIENv bnRlbnRTZWN1cml0eVBvbGljeTo6ZW1pdERpcmVjdGl2ZShjb25zdCBTdHJpbmcmIG5hbWUsIGNv bnN0IFN0cmluZyYgdmFsdWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRl bnRTZWN1cml0eVBvbGljeS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQ b2xpY3kuaAppbmRleCAwZWViZDA1OGZlZjk5NmVmNzdhMmUzOTlmMjZjYmI4NDFmODEzZDVhLi4y Nzg3MTY2ZmZkOGVkMmJlM2VmOGQ1ODFhYjAxZjY0MGI4NmM0YzZkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmgKQEAgLTQ4LDcgKzQ4LDcgQEAgcHJpdmF0 ZToKICAgICBDb250ZW50U2VjdXJpdHlQb2xpY3koKTsKIAogICAgIHZvaWQgcGFyc2UoY29uc3Qg U3RyaW5nJik7Ci0gICAgdm9pZCBwYXJzZURpcmVjdGl2ZShjb25zdCBVQ2hhciomIHBvcywgY29u c3QgVUNoYXIqIGVuZCwgVmVjdG9yPFVDaGFyLCAzMj4mIG5hbWUsIFZlY3RvcjxVQ2hhciwgNjQ+ JiB2YWx1ZSk7CisgICAgYm9vbCBwYXJzZURpcmVjdGl2ZShjb25zdCBVQ2hhciomIHBvcywgY29u c3QgVUNoYXIqIGVuZCwgVmVjdG9yPFVDaGFyLCAzMj4mIG5hbWUsIFZlY3RvcjxVQ2hhciwgNjQ+ JiB2YWx1ZSk7CiAgICAgdm9pZCBlbWl0RGlyZWN0aXZlKGNvbnN0IFN0cmluZyYgbmFtZSwgY29u c3QgU3RyaW5nJiB2YWx1ZSk7CiAKICAgICBib29sIG1faGF2ZVBvbGljeTsK