125722 2013-12-13 19:55:25 -0800 Small string improvements to JSInjectedScriptHost::type and other bindings 2013-12-14 09:49:57 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned commit-queue joepeck timothy oldest_to_newest 959741 0 joepeck 2013-12-13 19:55:25 -0800 This function returns a few strings that JSC VM's always have ("string", "boolean", "number"). And other jsString(...) calls can use ASCIILiteral. NOTE: The paths that now return smallString are not used because InjectedScriptHost::type calls in InjectedScriptSource avoid calling type for primitives (at least right now). 959742 1 219222 joepeck 2013-12-13 19:56:19 -0800 Created attachment 219222 [PATCH] Proposed Fix 959753 2 219222 darin 2013-12-13 20:24:25 -0800 Comment on attachment 219222 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=219222&action=review > Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp:133 > + return jsString(exec, ASCIILiteral("array")); These should all be jsNontrivialString. 959782 3 joepeck 2013-12-13 22:08:17 -0800 (In reply to comment #2) > (From update of attachment 219222 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=219222&action=review > > > Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp:133 > > + return jsString(exec, ASCIILiteral("array")); > > These should all be jsNontrivialString. Oh cool! 959784 4 219238 joepeck 2013-12-13 22:19:23 -0800 Created attachment 219238 [PATCH] Incorporated Feedback This covers all the /jsString\(.*?"/ in Source/ 959841 5 219238 commit-queue 2013-12-14 09:49:55 -0800 Comment on attachment 219238 [PATCH] Incorporated Feedback Clearing flags on attachment: 219238 Committed r160597: <http://trac.webkit.org/changeset/160597> 959842 6 commit-queue 2013-12-14 09:49:57 -0800 All reviewed patches have been landed. Closing bug. 219222 2013-12-13 19:56:19 -0800 2013-12-13 22:19:23 -0800 [PATCH] Proposed Fix strings.patch text/plain 3097 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMmQxMGJjLi4xOGJjOGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTMtMTItMTMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBTbWFsbCBzdHJpbmcgaW1wcm92ZW1lbnRzIHRvIEpTSW5qZWN0ZWRTY3JpcHRIb3N0 Ojp0eXBlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MjU3MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGJpbmRpbmdzL2pzL0pTSW5qZWN0ZWRTY3JpcHRIb3N0Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkpTSW5qZWN0ZWRTY3JpcHRIb3N0Ojp0eXBlKToKKworMjAxMy0xMi0xMyAgSm9zZXBo IFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IE1vdmUgSW5zcGVjdG9yIGFuZCBEZWJ1Z2dlciBwcm90b2NvbCBkb21haW5zIGludG8gSmF2YVNj cmlwdENvcmUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyNTcwNwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0luamVj dGVkU2NyaXB0SG9zdEN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0lu amVjdGVkU2NyaXB0SG9zdEN1c3RvbS5jcHAKaW5kZXggMGI0NTIxNi4uMGRlMjMyNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbmplY3RlZFNjcmlwdEhvc3RDdXN0 b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW5qZWN0ZWRTY3JpcHRI b3N0Q3VzdG9tLmNwcApAQCAtMTI4LDI5ICsxMjgsMzAgQEAgSlNWYWx1ZSBKU0luamVjdGVkU2Ny aXB0SG9zdDo6dHlwZShFeGVjU3RhdGUqIGV4ZWMpCiAKICAgICBKU1ZhbHVlIHZhbHVlID0gZXhl Yy0+dW5jaGVja2VkQXJndW1lbnQoMCk7CiAgICAgaWYgKHZhbHVlLmlzU3RyaW5nKCkpCi0gICAg ICAgIHJldHVybiBqc1N0cmluZyhleGVjLCBTdHJpbmcoInN0cmluZyIpKTsKKyAgICAgICAgcmV0 dXJuIGV4ZWMtPnZtKCkuc21hbGxTdHJpbmdzLnN0cmluZ1N0cmluZygpOwogICAgIGlmICh2YWx1 ZS5pbmhlcml0cyhKU0FycmF5OjppbmZvKCkpKQotICAgICAgICByZXR1cm4ganNTdHJpbmcoZXhl YywgU3RyaW5nKCJhcnJheSIpKTsKKyAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIEFTQ0lJ TGl0ZXJhbCgiYXJyYXkiKSk7CiAgICAgaWYgKHZhbHVlLmlzQm9vbGVhbigpKQotICAgICAgICBy ZXR1cm4ganNTdHJpbmcoZXhlYywgU3RyaW5nKCJib29sZWFuIikpOworICAgICAgICByZXR1cm4g ZXhlYy0+dm0oKS5zbWFsbFN0cmluZ3MuYm9vbGVhblN0cmluZygpOwogICAgIGlmICh2YWx1ZS5p c051bWJlcigpKQotICAgICAgICByZXR1cm4ganNTdHJpbmcoZXhlYywgU3RyaW5nKCJudW1iZXIi KSk7CisgICAgICAgIHJldHVybiBleGVjLT52bSgpLnNtYWxsU3RyaW5ncy5udW1iZXJTdHJpbmco KTsKICAgICBpZiAodmFsdWUuaW5oZXJpdHMoRGF0ZUluc3RhbmNlOjppbmZvKCkpKQotICAgICAg ICByZXR1cm4ganNTdHJpbmcoZXhlYywgU3RyaW5nKCJkYXRlIikpOworICAgICAgICByZXR1cm4g anNTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJkYXRlIikpOwogICAgIGlmICh2YWx1ZS5pbmhl cml0cyhSZWdFeHBPYmplY3Q6OmluZm8oKSkpCi0gICAgICAgIHJldHVybiBqc1N0cmluZyhleGVj LCBTdHJpbmcoInJlZ2V4cCIpKTsKKyAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIEFTQ0lJ TGl0ZXJhbCgicmVnZXhwIikpOwogICAgIGlmICh2YWx1ZS5pbmhlcml0cyhKU05vZGU6OmluZm8o KSkpCi0gICAgICAgIHJldHVybiBqc1N0cmluZyhleGVjLCBTdHJpbmcoIm5vZGUiKSk7CisgICAg ICAgIHJldHVybiBqc1N0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoIm5vZGUiKSk7CiAgICAgaWYg KHZhbHVlLmluaGVyaXRzKEpTTm9kZUxpc3Q6OmluZm8oKSkpCi0gICAgICAgIHJldHVybiBqc1N0 cmluZyhleGVjLCBTdHJpbmcoImFycmF5IikpOworICAgICAgICByZXR1cm4ganNTdHJpbmcoZXhl YywgQVNDSUlMaXRlcmFsKCJhcnJheSIpKTsKICAgICBpZiAodmFsdWUuaW5oZXJpdHMoSlNIVE1M Q29sbGVjdGlvbjo6aW5mbygpKSkKLSAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIFN0cmlu ZygiYXJyYXkiKSk7CisgICAgICAgIHJldHVybiBqc1N0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwo ImFycmF5IikpOwogICAgIGlmICh2YWx1ZS5pbmhlcml0cyhKU0ludDhBcnJheTo6aW5mbygpKSB8 fCB2YWx1ZS5pbmhlcml0cyhKU0ludDE2QXJyYXk6OmluZm8oKSkgfHwgdmFsdWUuaW5oZXJpdHMo SlNJbnQzMkFycmF5OjppbmZvKCkpKQotICAgICAgICByZXR1cm4ganNTdHJpbmcoZXhlYywgU3Ry aW5nKCJhcnJheSIpKTsKKyAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJh bCgiYXJyYXkiKSk7CiAgICAgaWYgKHZhbHVlLmluaGVyaXRzKEpTVWludDhBcnJheTo6aW5mbygp KSB8fCB2YWx1ZS5pbmhlcml0cyhKU1VpbnQxNkFycmF5OjppbmZvKCkpIHx8IHZhbHVlLmluaGVy aXRzKEpTVWludDMyQXJyYXk6OmluZm8oKSkpCi0gICAgICAgIHJldHVybiBqc1N0cmluZyhleGVj LCBTdHJpbmcoImFycmF5IikpOworICAgICAgICByZXR1cm4ganNTdHJpbmcoZXhlYywgQVNDSUlM aXRlcmFsKCJhcnJheSIpKTsKICAgICBpZiAodmFsdWUuaW5oZXJpdHMoSlNGbG9hdDMyQXJyYXk6 OmluZm8oKSkgfHwgdmFsdWUuaW5oZXJpdHMoSlNGbG9hdDY0QXJyYXk6OmluZm8oKSkpCi0gICAg ICAgIHJldHVybiBqc1N0cmluZyhleGVjLCBTdHJpbmcoImFycmF5IikpOworICAgICAgICByZXR1 cm4ganNTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJhcnJheSIpKTsKKwogICAgIHJldHVybiBq c1VuZGVmaW5lZCgpOwogfQogCg== 219238 2013-12-13 22:19:23 -0800 2013-12-14 09:49:55 -0800 [PATCH] Incorporated Feedback improvedstring.patch text/plain 5001 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMmQxMGJjLi5kODM1NzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQg QEAKIDIwMTMtMTItMTMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBTbWFsbCBzdHJpbmcgaW1wcm92ZW1lbnRzIHRvIEpTSW5qZWN0ZWRTY3JpcHRIb3N0 Ojp0eXBlIGFuZCBvdGhlciBiaW5kaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NzIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0luamVjdGVkU2NyaXB0SG9zdEN1c3Rv bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0luamVjdGVkU2NyaXB0SG9zdDo6dHlwZSk6Cisg ICAgICAgIFVzZSBTbWFsbFN0cmluZ3MsIGpzTm9udHJpdmlhbFN0cmluZyBhbmQgQVNDSUlMaXRl cmFsLgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNKYXZhU2NyaXB0Q2FsbEZyYW1lQ3VzdG9t LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTSmF2YVNjcmlwdENhbGxGcmFtZTo6dHlwZSk6Cisg ICAgICAgIFVzZSBqc05vbnRyaXZpYWxTdHJpbmcuCisKKyAgICAgICAgKiBicmlkZ2UvYy9jX2lu c3RhbmNlLmNwcDoKKyAgICAgICAgKEpTQzo6QmluZGluZ3M6OkNJbnN0YW5jZTo6c3RyaW5nVmFs dWUpOgorICAgICAgICBVc2UganNOb250cml2aWFsU3RyaW5nIGFuZCBBU0NJSUxpdGVyYWwuCisK KzIwMTMtMTItMTMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBNb3ZlIEluc3BlY3RvciBhbmQgRGVidWdnZXIgcHJvdG9jb2wg ZG9tYWlucyBpbnRvIEphdmFTY3JpcHRDb3JlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU3MDcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNJbmplY3RlZFNjcmlwdEhvc3RDdXN0b20uY3BwIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNJbmplY3RlZFNjcmlwdEhvc3RDdXN0b20uY3BwCmluZGV4IDBiNDUy MTYuLjI0MTc2MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW5q ZWN0ZWRTY3JpcHRIb3N0Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0luamVjdGVkU2NyaXB0SG9zdEN1c3RvbS5jcHAKQEAgLTEyOCwyOSArMTI4LDMwIEBAIEpT VmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6OnR5cGUoRXhlY1N0YXRlKiBleGVjKQogCiAgICAg SlNWYWx1ZSB2YWx1ZSA9IGV4ZWMtPnVuY2hlY2tlZEFyZ3VtZW50KDApOwogICAgIGlmICh2YWx1 ZS5pc1N0cmluZygpKQotICAgICAgICByZXR1cm4ganNTdHJpbmcoZXhlYywgU3RyaW5nKCJzdHJp bmciKSk7CisgICAgICAgIHJldHVybiBleGVjLT52bSgpLnNtYWxsU3RyaW5ncy5zdHJpbmdTdHJp bmcoKTsKICAgICBpZiAodmFsdWUuaW5oZXJpdHMoSlNBcnJheTo6aW5mbygpKSkKLSAgICAgICAg cmV0dXJuIGpzU3RyaW5nKGV4ZWMsIFN0cmluZygiYXJyYXkiKSk7CisgICAgICAgIHJldHVybiBq c05vbnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJhcnJheSIpKTsKICAgICBpZiAo dmFsdWUuaXNCb29sZWFuKCkpCi0gICAgICAgIHJldHVybiBqc1N0cmluZyhleGVjLCBTdHJpbmco ImJvb2xlYW4iKSk7CisgICAgICAgIHJldHVybiBleGVjLT52bSgpLnNtYWxsU3RyaW5ncy5ib29s ZWFuU3RyaW5nKCk7CiAgICAgaWYgKHZhbHVlLmlzTnVtYmVyKCkpCi0gICAgICAgIHJldHVybiBq c1N0cmluZyhleGVjLCBTdHJpbmcoIm51bWJlciIpKTsKKyAgICAgICAgcmV0dXJuIGV4ZWMtPnZt KCkuc21hbGxTdHJpbmdzLm51bWJlclN0cmluZygpOwogICAgIGlmICh2YWx1ZS5pbmhlcml0cyhE YXRlSW5zdGFuY2U6OmluZm8oKSkpCi0gICAgICAgIHJldHVybiBqc1N0cmluZyhleGVjLCBTdHJp bmcoImRhdGUiKSk7CisgICAgICAgIHJldHVybiBqc05vbnRyaXZpYWxTdHJpbmcoZXhlYywgQVND SUlMaXRlcmFsKCJkYXRlIikpOwogICAgIGlmICh2YWx1ZS5pbmhlcml0cyhSZWdFeHBPYmplY3Q6 OmluZm8oKSkpCi0gICAgICAgIHJldHVybiBqc1N0cmluZyhleGVjLCBTdHJpbmcoInJlZ2V4cCIp KTsKKyAgICAgICAgcmV0dXJuIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwo InJlZ2V4cCIpKTsKICAgICBpZiAodmFsdWUuaW5oZXJpdHMoSlNOb2RlOjppbmZvKCkpKQotICAg ICAgICByZXR1cm4ganNTdHJpbmcoZXhlYywgU3RyaW5nKCJub2RlIikpOworICAgICAgICByZXR1 cm4ganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgibm9kZSIpKTsKICAgICBp ZiAodmFsdWUuaW5oZXJpdHMoSlNOb2RlTGlzdDo6aW5mbygpKSkKLSAgICAgICAgcmV0dXJuIGpz U3RyaW5nKGV4ZWMsIFN0cmluZygiYXJyYXkiKSk7CisgICAgICAgIHJldHVybiBqc05vbnRyaXZp YWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJhcnJheSIpKTsKICAgICBpZiAodmFsdWUuaW5o ZXJpdHMoSlNIVE1MQ29sbGVjdGlvbjo6aW5mbygpKSkKLSAgICAgICAgcmV0dXJuIGpzU3RyaW5n KGV4ZWMsIFN0cmluZygiYXJyYXkiKSk7CisgICAgICAgIHJldHVybiBqc05vbnRyaXZpYWxTdHJp bmcoZXhlYywgQVNDSUlMaXRlcmFsKCJhcnJheSIpKTsKICAgICBpZiAodmFsdWUuaW5oZXJpdHMo SlNJbnQ4QXJyYXk6OmluZm8oKSkgfHwgdmFsdWUuaW5oZXJpdHMoSlNJbnQxNkFycmF5OjppbmZv KCkpIHx8IHZhbHVlLmluaGVyaXRzKEpTSW50MzJBcnJheTo6aW5mbygpKSkKLSAgICAgICAgcmV0 dXJuIGpzU3RyaW5nKGV4ZWMsIFN0cmluZygiYXJyYXkiKSk7CisgICAgICAgIHJldHVybiBqc05v bnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJhcnJheSIpKTsKICAgICBpZiAodmFs dWUuaW5oZXJpdHMoSlNVaW50OEFycmF5OjppbmZvKCkpIHx8IHZhbHVlLmluaGVyaXRzKEpTVWlu dDE2QXJyYXk6OmluZm8oKSkgfHwgdmFsdWUuaW5oZXJpdHMoSlNVaW50MzJBcnJheTo6aW5mbygp KSkKLSAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIFN0cmluZygiYXJyYXkiKSk7CisgICAg ICAgIHJldHVybiBqc05vbnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJhcnJheSIp KTsKICAgICBpZiAodmFsdWUuaW5oZXJpdHMoSlNGbG9hdDMyQXJyYXk6OmluZm8oKSkgfHwgdmFs dWUuaW5oZXJpdHMoSlNGbG9hdDY0QXJyYXk6OmluZm8oKSkpCi0gICAgICAgIHJldHVybiBqc1N0 cmluZyhleGVjLCBTdHJpbmcoImFycmF5IikpOworICAgICAgICByZXR1cm4ganNOb250cml2aWFs U3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgiYXJyYXkiKSk7CisKICAgICByZXR1cm4ganNVbmRl ZmluZWQoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNK YXZhU2NyaXB0Q2FsbEZyYW1lQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTSmF2YVNjcmlwdENhbGxGcmFtZUN1c3RvbS5jcHAKaW5kZXggOTUzNTQ2ZS4uNTU2MTRhNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNKYXZhU2NyaXB0Q2FsbEZy YW1lQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0phdmFTY3Jp cHRDYWxsRnJhbWVDdXN0b20uY3BwCkBAIC01NiwxMCArNTYsMTAgQEAgSlNWYWx1ZSBKU0phdmFT Y3JpcHRDYWxsRnJhbWU6OnRoaXNPYmplY3QoRXhlY1N0YXRlKikgY29uc3QKIEpTVmFsdWUgSlNK YXZhU2NyaXB0Q2FsbEZyYW1lOjp0eXBlKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKIHsKICAgICBz d2l0Y2ggKGltcGwoKS50eXBlKCkpIHsKLSAgICAgICAgY2FzZSBEZWJ1Z2dlckNhbGxGcmFtZTo6 RnVuY3Rpb25UeXBlOgotICAgICAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0 ZXJhbCgiZnVuY3Rpb24iKSk7Ci0gICAgICAgIGNhc2UgRGVidWdnZXJDYWxsRnJhbWU6OlByb2dy YW1UeXBlOgotICAgICAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgi cHJvZ3JhbSIpKTsKKyAgICBjYXNlIERlYnVnZ2VyQ2FsbEZyYW1lOjpGdW5jdGlvblR5cGU6Cisg ICAgICAgIHJldHVybiBqc05vbnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJmdW5j dGlvbiIpKTsKKyAgICBjYXNlIERlYnVnZ2VyQ2FsbEZyYW1lOjpQcm9ncmFtVHlwZToKKyAgICAg ICAgcmV0dXJuIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoInByb2dyYW0i KSk7CiAgICAgfQogCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9icmlkZ2UvYy9jX2luc3RhbmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JyaWRn ZS9jL2NfaW5zdGFuY2UuY3BwCmluZGV4IGVkYTA4M2UuLjQ0MWMyMGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JyaWRnZS9jL2NfaW5zdGFuY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JyaWRnZS9jL2NfaW5zdGFuY2UuY3BwCkBAIC0yODMsNyArMjgzLDcgQEAgSlNWYWx1ZSBDSW5z dGFuY2U6OnN0cmluZ1ZhbHVlKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKICAgICAgICAgcmV0dXJu IHZhbHVlOwogCiAgICAgLy8gRmFsbGJhY2sgdG8gZGVmYXVsdCBpbXBsZW1lbnRhdGlvbi4KLSAg ICByZXR1cm4ganNTdHJpbmcoZXhlYywgIk5QT2JqZWN0Iik7CisgICAgcmV0dXJuIGpzTm9udHJp dmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoIk5QT2JqZWN0IikpOwogfQogCiBKU1ZhbHVl IENJbnN0YW5jZTo6bnVtYmVyVmFsdWUoRXhlY1N0YXRlKikgY29uc3QK