159855 2016-07-16 12:43:42 -0700 Exceptions logged to the JS console should use toString() 2016-07-17 12:14:08 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 159822 1 beidson beidson achristensen darin oldest_to_newest 1211784 0 beidson 2016-07-16 12:43:42 -0700 Change how exceptions are logged in the JS console to not look redundant and silly. This is needed with work on https://bugs.webkit.org/show_bug.cgi?id=159822, which is making exception messages more rich. An example of how this work effects console.log can be found here - https://bugs.webkit.org/show_bug.cgi?id=159847#c2 CONSOLE MESSAGE: line 14: An invalid value was passed to an operation or assigned to an attribute.: An invalid value was passed to an operation or assigned to an attribute. The code responsible is in JSDOMBinding.cpp: void reportException(ExecState* exec, Exception* exception, CachedScript* cachedScript, ExceptionDetails* exceptionDetails) ... errorMessage = exceptionBase->message() + ": " + exceptionBase->description(); For Exceptions that have adopted the "description as message" mode, the message and the description are the same. This can all get cleaned up once the task represented by 159822 is complete, but for now we should do something a little different for the new exceptions vs the old ones. 1211787 1 beidson 2016-07-16 12:50:05 -0700 Retitled: Exceptions logged to the JS console should use toString() 1211839 2 beidson 2016-07-17 08:41:42 -0700 *** Bug 159845 has been marked as a duplicate of this bug. *** 1211841 3 beidson 2016-07-17 08:41:46 -0700 *** Bug 159846 has been marked as a duplicate of this bug. *** 1211844 4 darin 2016-07-17 09:29:42 -0700 When we change this to use toString, I think we possibly want to use a variant of toString that does not run arbitrary code. 1211849 5 283866 beidson 2016-07-17 10:14:55 -0700 Created attachment 283866 Patch 1211850 6 beidson 2016-07-17 10:15:43 -0700 (In reply to comment #4) > When we change this to use toString, I think we possibly want to use a > variant of toString that does not run arbitrary code. Okay. 1211851 7 beidson 2016-07-17 10:19:16 -0700 (In reply to comment #6) > (In reply to comment #4) > > When we change this to use toString, I think we possibly want to use a > > variant of toString that does not run arbitrary code. > > Okay. Seems useful to not initialize a "toString" message when the ExceptionBase is made, as it's not always needed. So toString() will still run code, but cache the result. 1211852 8 283867 beidson 2016-07-17 10:22:05 -0700 Created attachment 283867 Patch 1211854 9 283867 darin 2016-07-17 10:57:13 -0700 Comment on attachment 283867 Patch This is fine. When I said not run "arbitrary code", I meant specifically that it should not run arbitrary JavaScript code, not C++ code. 1211859 10 beidson 2016-07-17 12:12:29 -0700 (In reply to comment #9) > Comment on attachment 283867 [details] > Patch > > This is fine. When I said not run "arbitrary code", I meant specifically > that it should not run arbitrary JavaScript code, not C++ code. Ah! Yah, we're definitely fine there. 1211860 11 beidson 2016-07-17 12:14:08 -0700 https://trac.webkit.org/changeset/203334 283866 2016-07-17 10:14:55 -0700 2016-07-17 10:22:02 -0700 Patch bug-159855-20160717101516.patch text/plain 6854 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWRiNmFiNGIwMTFmNTY3 ZjliMWM4ZmNhYWM1ZGI4YzQwZTljNjIwOS4uMGI0Mzk5M2Q0NzBlMGM3NWVkYjYxN2M0Zjg0MjM0 NzI0MGNmNGQ4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE2LTA3LTE3ICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAorICAgICAgICBFeGNlcHRpb25zIGxvZ2dl ZCB0byB0aGUgSlMgY29uc29sZSBzaG91bGQgdXNlIHRvU3RyaW5nKCkuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk4NTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE5vIGNoYW5n ZSBpbiBiZWhhdmlvcikuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6cmVwb3J0RXhjZXB0aW9uKToKKworICAgICAgICAqIGRvbS9E T01Db3JlRXhjZXB0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpET01Db3JlRXhjZXB0aW9uOjpE T01Db3JlRXhjZXB0aW9uKToKKworICAgICAgICAqIGRvbS9FeGNlcHRpb25CYXNlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkV4Y2VwdGlvbkJhc2U6OkV4Y2VwdGlvbkJhc2UpOgorICAgICAgICAo V2ViQ29yZTo6RXhjZXB0aW9uQmFzZTo6dG9TdHJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RXhj ZXB0aW9uQmFzZTo6Y29uc29sZUVycm9yTWVzc2FnZSk6IERlbGV0ZWQuCisgICAgICAgICogZG9t L0V4Y2VwdGlvbkJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkV4Y2VwdGlvbkJhc2U6OmRlc2Ny aXB0aW9uKTogRGVsZXRlZC4KKworICAgICAgICAqIHN2Zy9TVkdFeGNlcHRpb24uaDoKKworICAg ICAgICAqIHhtbC9YUGF0aEV4Y2VwdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6WFBhdGhFeGNl cHRpb246OlhQYXRoRXhjZXB0aW9uKToKKworMjAxNi0wNy0xNyAgQnJhZHkgRWlkc29uICA8YmVp ZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgVXBkYXRlIERPTUNvcmVFeGNlcHRpb24gdG8gdXNl IHRoZSBkZXNjcmlwdGlvbiBpbiB0b1N0cmluZygpLgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5ODU3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0RPTUJpbmRpbmcuY3BwCmluZGV4IDY4OGU0ZWE0ODk3ODk2NDkyYWQyNDJkOThjZDg1 M2M1OWRmOTNhOGQuLjVlMmFmMDJjOThlMDE0Y2U4NDgyODQxM2Y5Mjk4YTZjZmYwMWIzZGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmNwcApAQCAtMjAwLDcg KzIwMCw3IEBAIHZvaWQgcmVwb3J0RXhjZXB0aW9uKEV4ZWNTdGF0ZSogZXhlYywgRXhjZXB0aW9u KiBleGNlcHRpb24sIENhY2hlZFNjcmlwdCogY2FjaGVkCiAgICAgU3RyaW5nIGVycm9yTWVzc2Fn ZTsKICAgICBKU1ZhbHVlIGV4Y2VwdGlvblZhbHVlID0gZXhjZXB0aW9uLT52YWx1ZSgpOwogICAg IGlmIChFeGNlcHRpb25CYXNlKiBleGNlcHRpb25CYXNlID0gdG9FeGNlcHRpb25CYXNlKGV4Y2Vw dGlvblZhbHVlKSkKLSAgICAgICAgZXJyb3JNZXNzYWdlID0gZXhjZXB0aW9uQmFzZS0+Y29uc29s ZUVycm9yTWVzc2FnZSgpOworICAgICAgICBlcnJvck1lc3NhZ2UgPSBleGNlcHRpb25CYXNlLT50 b1N0cmluZygpOwogICAgIGVsc2UgewogICAgICAgICAvLyBGSVhNRTogPGh0dHA6Ly93ZWJraXQu b3JnL2IvMTE1MDg3PiBXZWIgSW5zcGVjdG9yOiBXZWJDb3JlOjpyZXBvcnRFeGNlcHRpb24gc2hv dWxkIG5vdCBldmFsdWF0ZSBKYXZhU2NyaXB0IGhhbmRsaW5nIGV4Y2VwdGlvbnMKICAgICAgICAg Ly8gSWYgdGhpcyBpcyBhIGN1c3RvbSBleGNlcHRpb24gb2JqZWN0LCBjYWxsIHRvU3RyaW5nIG9u IGl0IHRvIHRyeSBhbmQgZ2V0IGEgbmljZSBzdHJpbmcgcmVwcmVzZW50YXRpb24gZm9yIHRoZSBl eGNlcHRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRE9NQ29yZUV4Y2VwdGlv bi5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0RPTUNvcmVFeGNlcHRpb24uaAppbmRleCBjMGM2Y2E5 Yjc0ZTA5M2MwNjcyNjRmNThmNjdjNzI0YmIxYzkwYzBiLi4zNDI5ZjNlMmRhMTU0ODhiOWFmZjdh MDhlYzgyY2Y0ZWUwMGMxYWU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRE9NQ29y ZUV4Y2VwdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9ET01Db3JlRXhjZXB0aW9uLmgK QEAgLTQ0LDcgKzQ0LDcgQEAgcHVibGljOgogCiBwcm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQgRE9N Q29yZUV4Y2VwdGlvbihjb25zdCBFeGNlcHRpb25Db2RlRGVzY3JpcHRpb24mIGRlc2NyaXB0aW9u KQotICAgICAgICA6IEV4Y2VwdGlvbkJhc2UoZGVzY3JpcHRpb24sIEV4Y2VwdGlvbkJhc2U6Ok1l c3NhZ2VTb3VyY2U6OlVzZURlc2NyaXB0aW9uKQorICAgICAgICA6IEV4Y2VwdGlvbkJhc2UoZGVz Y3JpcHRpb24pCiAgICAgewogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k b20vRXhjZXB0aW9uQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXhjZXB0aW9uQmFzZS5j cHAKaW5kZXggYzkxZDg2NGJlNmM4NTgxMGNhYjkxZTU0MmRhMGI3M2Q5MTI5MDc4OS4uNWZjNzhm YmViMjZlNTdiOTc3ZWM1NTI2MDlkMjkzYmRhZDI1MDg2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0V4Y2VwdGlvbkJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FeGNl cHRpb25CYXNlLmNwcApAQCAtMzMsNDAgKzMzLDE5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAotRXhjZXB0aW9uQmFzZTo6RXhjZXB0aW9uQmFzZShjb25zdCBFeGNlcHRpb25Db2RlRGVzY3Jp cHRpb24mIGRlc2NyaXB0aW9uLCBNZXNzYWdlU291cmNlIG1lc3NhZ2VTb3VyY2UpCitFeGNlcHRp b25CYXNlOjpFeGNlcHRpb25CYXNlKGNvbnN0IEV4Y2VwdGlvbkNvZGVEZXNjcmlwdGlvbiYgZGVz Y3JpcHRpb24pCiAgICAgOiBtX2NvZGUoZGVzY3JpcHRpb24uY29kZSkKICAgICAsIG1fbmFtZShk ZXNjcmlwdGlvbi5uYW1lKQotICAgICwgbV9kZXNjcmlwdGlvbihkZXNjcmlwdGlvbi5kZXNjcmlw dGlvbikKKyAgICAsIG1fbWVzc2FnZShkZXNjcmlwdGlvbi5kZXNjcmlwdGlvbikKICAgICAsIG1f dHlwZU5hbWUoZGVzY3JpcHRpb24udHlwZU5hbWUpCi0gICAgLCBtX21lc3NhZ2VTb3VyY2UobWVz c2FnZVNvdXJjZSkKIHsKLSAgICBpZiAobWVzc2FnZVNvdXJjZSA9PSBNZXNzYWdlU291cmNlOjpV c2VEZXNjcmlwdGlvbikgewotICAgICAgICBtX21lc3NhZ2UgPSBtX2Rlc2NyaXB0aW9uOwotICAg ICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgaWYgKGRlc2NyaXB0aW9uLm5hbWUpCi0gICAgICAg IG1fbWVzc2FnZSA9IG1fbmFtZSArICI6ICIgKyBkZXNjcmlwdGlvbi50eXBlTmFtZSArICIgRXhj ZXB0aW9uICIgKyBTdHJpbmc6Om51bWJlcihkZXNjcmlwdGlvbi5jb2RlKTsKLSAgICBlbHNlCi0g ICAgICAgIG1fbWVzc2FnZSA9IG1ha2VTdHJpbmcoZGVzY3JpcHRpb24udHlwZU5hbWUsICIgRXhj ZXB0aW9uICIsIFN0cmluZzo6bnVtYmVyKGRlc2NyaXB0aW9uLmNvZGUpKTsKLX0KLQotU3RyaW5n IEV4Y2VwdGlvbkJhc2U6OmNvbnNvbGVFcnJvck1lc3NhZ2UoKSBjb25zdAotewotICAgIGlmICht X21lc3NhZ2VTb3VyY2UgPT0gTWVzc2FnZVNvdXJjZTo6VXNlRGVzY3JpcHRpb24pCi0gICAgICAg IHJldHVybiB0b1N0cmluZygpOwotCi0gICAgcmV0dXJuIG1ha2VTdHJpbmcobV9tZXNzYWdlLCAi OiAiLCBtX2Rlc2NyaXB0aW9uKTsKIH0KIAogU3RyaW5nIEV4Y2VwdGlvbkJhc2U6OnRvU3RyaW5n KCkgY29uc3QKIHsKLSAgICBpZiAobV9tZXNzYWdlU291cmNlICE9IE1lc3NhZ2VTb3VyY2U6OlVz ZURlc2NyaXB0aW9uKQotICAgICAgICByZXR1cm4gbWFrZVN0cmluZygiRXJyb3I6ICIsIG1fbWVz c2FnZSk7Ci0KICAgICBTdHJpbmcgbGFzdENvbXBvbmVudDsKLSAgICBpZiAoIW1fZGVzY3JpcHRp b24uaXNFbXB0eSgpKQotICAgICAgICBsYXN0Q29tcG9uZW50ID0gbWFrZVN0cmluZygiOiAiLCBt X2Rlc2NyaXB0aW9uKTsKKyAgICBpZiAoIW1fbWVzc2FnZS5pc0VtcHR5KCkpCisgICAgICAgIGxh c3RDb21wb25lbnQgPSBtYWtlU3RyaW5nKCI6ICIsIG1fbWVzc2FnZSk7CiAKICAgICBpZiAobV9u YW1lLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIG1ha2VTdHJpbmcobV90eXBlTmFtZSwgIiBF eGNlcHRpb24iLCBtX2NvZGUgPyBtYWtlU3RyaW5nKCIgIiwgU3RyaW5nOjpudW1iZXIobV9jb2Rl KSkgOiAiIiwgbGFzdENvbXBvbmVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v RXhjZXB0aW9uQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0V4Y2VwdGlvbkJhc2UuaAppbmRl eCA5NzRlMWE0ODczMWI5MjAxOWJmYzRmNzEyYTZjOTM2N2E5MDc0MjFmLi42YzgxMDIxMTYwOTgy NTBiMjkwNjFkYmY0MGI3YWYwYzY5Mjc5ZThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vRXhjZXB0aW9uQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FeGNlcHRpb25CYXNl LmgKQEAgLTQyLDI4ICs0MiwxNyBAQCBwdWJsaWM6CiAgICAgdW5zaWduZWQgc2hvcnQgY29kZSgp IGNvbnN0IHsgcmV0dXJuIG1fY29kZTsgfQogICAgIFN0cmluZyBuYW1lKCkgY29uc3QgeyByZXR1 cm4gbV9uYW1lOyB9CiAgICAgU3RyaW5nIG1lc3NhZ2UoKSBjb25zdCB7IHJldHVybiBtX21lc3Nh Z2U7IH0KLSAgICBTdHJpbmcgZGVzY3JpcHRpb24oKSBjb25zdCB7IHJldHVybiBtX2Rlc2NyaXB0 aW9uOyB9CiAKICAgICBTdHJpbmcgdG9TdHJpbmcoKSBjb25zdDsKIAotICAgIC8vIEZJWE1FOiBj b25zb2xlRXJyb3JNZXNzYWdlIGlzIG5lZWRlZCB0ZW1wb3JhcmlseSB3aGlsZSBidWcgMTU5ODIy IGlzIGluIHByb2dyZXNzLgotICAgIC8vIE9uY2UgMTU5ODIyIGlzIGNvbXBsZXRlLCBjb25zb2xl RXJyb3JNZXNzYWdlIGNhbiBiZSBkcm9wcGVkIGFuZCBpdHMgY2FsbGVycyB3aWxsIHVzZSB0b1N0 cmluZyBpbnN0ZWFkLgotICAgIFN0cmluZyBjb25zb2xlRXJyb3JNZXNzYWdlKCkgY29uc3Q7Ci0K IHByb3RlY3RlZDoKLSAgICBlbnVtIGNsYXNzIE1lc3NhZ2VTb3VyY2UgewotICAgICAgICBDb25z dHJ1Y3RNZXNzYWdlLAotICAgICAgICBVc2VEZXNjcmlwdGlvbiwKLSAgICB9OwotICAgIGV4cGxp Y2l0IEV4Y2VwdGlvbkJhc2UoY29uc3QgRXhjZXB0aW9uQ29kZURlc2NyaXB0aW9uJiwgTWVzc2Fn ZVNvdXJjZSA9IE1lc3NhZ2VTb3VyY2U6OkNvbnN0cnVjdE1lc3NhZ2UpOworICAgIGV4cGxpY2l0 IEV4Y2VwdGlvbkJhc2UoY29uc3QgRXhjZXB0aW9uQ29kZURlc2NyaXB0aW9uJik7CiAKIHByaXZh dGU6CiAgICAgdW5zaWduZWQgc2hvcnQgbV9jb2RlOwogICAgIFN0cmluZyBtX25hbWU7CiAgICAg U3RyaW5nIG1fbWVzc2FnZTsKLSAgICBTdHJpbmcgbV9kZXNjcmlwdGlvbjsKICAgICBTdHJpbmcg bV90eXBlTmFtZTsKLSAgICBNZXNzYWdlU291cmNlIG1fbWVzc2FnZVNvdXJjZTsKIH07CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdF eGNlcHRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFeGNlcHRpb24uaAppbmRleCBiODJl MGU0NTM1ZDQ3OTQxZGEyZTBhNDYzMzExNzYyZGIzMmExOGJjLi5iYmRhNjA2MTg5MTA5Yjg4YWI2 NDM4NzFjMzY1N2Y1ZTAxYWM1MmZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZH RXhjZXB0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0V4Y2VwdGlvbi5oCkBAIC00 NSw3ICs0NSw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBTVkdFeGNlcHRpb24oY29uc3Qg RXhjZXB0aW9uQ29kZURlc2NyaXB0aW9uJiBkZXNjcmlwdGlvbikKLSAgICAgICAgOiBFeGNlcHRp b25CYXNlKGRlc2NyaXB0aW9uLCBFeGNlcHRpb25CYXNlOjpNZXNzYWdlU291cmNlOjpVc2VEZXNj cmlwdGlvbikKKyAgICAgICAgOiBFeGNlcHRpb25CYXNlKGRlc2NyaXB0aW9uKQogICAgIHsKICAg ICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUveG1sL1hQYXRoRXhjZXB0aW9uLmgg Yi9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhFeGNlcHRpb24uaAppbmRleCA1MGZiYjc5ZmY2YzFh ZWRjYzMwOWI5Mjg1MjQ1OGZjNWQ1ZWU1NDhhLi4xY2IzZTc0MjhmZDM2NjAxZTBlYTQyYzBlMmE1 MzY1NGI4YzMzODllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhFeGNlcHRp b24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhFeGNlcHRpb24uaApAQCAtNTIsNyAr NTIsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgWFBhdGhFeGNlcHRpb24o Y29uc3QgRXhjZXB0aW9uQ29kZURlc2NyaXB0aW9uJiBkZXNjcmlwdGlvbikKLSAgICAgICAgOiBF eGNlcHRpb25CYXNlKGRlc2NyaXB0aW9uLCBFeGNlcHRpb25CYXNlOjpNZXNzYWdlU291cmNlOjpV c2VEZXNjcmlwdGlvbikKKyAgICAgICAgOiBFeGNlcHRpb25CYXNlKGRlc2NyaXB0aW9uKQogICAg IHsKICAgICB9CiB9Owo= 283867 2016-07-17 10:22:05 -0700 2016-07-17 10:57:13 -0700 Patch bug-159855-20160717102226.patch text/plain 7429 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWRiNmFiNGIwMTFmNTY3 ZjliMWM4ZmNhYWM1ZGI4YzQwZTljNjIwOS4uMGI0Mzk5M2Q0NzBlMGM3NWVkYjYxN2M0Zjg0MjM0 NzI0MGNmNGQ4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE2LTA3LTE3ICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAorICAgICAgICBFeGNlcHRpb25zIGxvZ2dl ZCB0byB0aGUgSlMgY29uc29sZSBzaG91bGQgdXNlIHRvU3RyaW5nKCkuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk4NTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE5vIGNoYW5n ZSBpbiBiZWhhdmlvcikuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6cmVwb3J0RXhjZXB0aW9uKToKKworICAgICAgICAqIGRvbS9E T01Db3JlRXhjZXB0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpET01Db3JlRXhjZXB0aW9uOjpE T01Db3JlRXhjZXB0aW9uKToKKworICAgICAgICAqIGRvbS9FeGNlcHRpb25CYXNlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkV4Y2VwdGlvbkJhc2U6OkV4Y2VwdGlvbkJhc2UpOgorICAgICAgICAo V2ViQ29yZTo6RXhjZXB0aW9uQmFzZTo6dG9TdHJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RXhj ZXB0aW9uQmFzZTo6Y29uc29sZUVycm9yTWVzc2FnZSk6IERlbGV0ZWQuCisgICAgICAgICogZG9t L0V4Y2VwdGlvbkJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkV4Y2VwdGlvbkJhc2U6OmRlc2Ny aXB0aW9uKTogRGVsZXRlZC4KKworICAgICAgICAqIHN2Zy9TVkdFeGNlcHRpb24uaDoKKworICAg ICAgICAqIHhtbC9YUGF0aEV4Y2VwdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6WFBhdGhFeGNl cHRpb246OlhQYXRoRXhjZXB0aW9uKToKKworMjAxNi0wNy0xNyAgQnJhZHkgRWlkc29uICA8YmVp ZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgVXBkYXRlIERPTUNvcmVFeGNlcHRpb24gdG8gdXNl IHRoZSBkZXNjcmlwdGlvbiBpbiB0b1N0cmluZygpLgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5ODU3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0RPTUJpbmRpbmcuY3BwCmluZGV4IDY4OGU0ZWE0ODk3ODk2NDkyYWQyNDJkOThjZDg1 M2M1OWRmOTNhOGQuLjVlMmFmMDJjOThlMDE0Y2U4NDgyODQxM2Y5Mjk4YTZjZmYwMWIzZGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmNwcApAQCAtMjAwLDcg KzIwMCw3IEBAIHZvaWQgcmVwb3J0RXhjZXB0aW9uKEV4ZWNTdGF0ZSogZXhlYywgRXhjZXB0aW9u KiBleGNlcHRpb24sIENhY2hlZFNjcmlwdCogY2FjaGVkCiAgICAgU3RyaW5nIGVycm9yTWVzc2Fn ZTsKICAgICBKU1ZhbHVlIGV4Y2VwdGlvblZhbHVlID0gZXhjZXB0aW9uLT52YWx1ZSgpOwogICAg IGlmIChFeGNlcHRpb25CYXNlKiBleGNlcHRpb25CYXNlID0gdG9FeGNlcHRpb25CYXNlKGV4Y2Vw dGlvblZhbHVlKSkKLSAgICAgICAgZXJyb3JNZXNzYWdlID0gZXhjZXB0aW9uQmFzZS0+Y29uc29s ZUVycm9yTWVzc2FnZSgpOworICAgICAgICBlcnJvck1lc3NhZ2UgPSBleGNlcHRpb25CYXNlLT50 b1N0cmluZygpOwogICAgIGVsc2UgewogICAgICAgICAvLyBGSVhNRTogPGh0dHA6Ly93ZWJraXQu b3JnL2IvMTE1MDg3PiBXZWIgSW5zcGVjdG9yOiBXZWJDb3JlOjpyZXBvcnRFeGNlcHRpb24gc2hv dWxkIG5vdCBldmFsdWF0ZSBKYXZhU2NyaXB0IGhhbmRsaW5nIGV4Y2VwdGlvbnMKICAgICAgICAg Ly8gSWYgdGhpcyBpcyBhIGN1c3RvbSBleGNlcHRpb24gb2JqZWN0LCBjYWxsIHRvU3RyaW5nIG9u IGl0IHRvIHRyeSBhbmQgZ2V0IGEgbmljZSBzdHJpbmcgcmVwcmVzZW50YXRpb24gZm9yIHRoZSBl eGNlcHRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRE9NQ29yZUV4Y2VwdGlv bi5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0RPTUNvcmVFeGNlcHRpb24uaAppbmRleCBjMGM2Y2E5 Yjc0ZTA5M2MwNjcyNjRmNThmNjdjNzI0YmIxYzkwYzBiLi4zNDI5ZjNlMmRhMTU0ODhiOWFmZjdh MDhlYzgyY2Y0ZWUwMGMxYWU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRE9NQ29y ZUV4Y2VwdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9ET01Db3JlRXhjZXB0aW9uLmgK QEAgLTQ0LDcgKzQ0LDcgQEAgcHVibGljOgogCiBwcm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQgRE9N Q29yZUV4Y2VwdGlvbihjb25zdCBFeGNlcHRpb25Db2RlRGVzY3JpcHRpb24mIGRlc2NyaXB0aW9u KQotICAgICAgICA6IEV4Y2VwdGlvbkJhc2UoZGVzY3JpcHRpb24sIEV4Y2VwdGlvbkJhc2U6Ok1l c3NhZ2VTb3VyY2U6OlVzZURlc2NyaXB0aW9uKQorICAgICAgICA6IEV4Y2VwdGlvbkJhc2UoZGVz Y3JpcHRpb24pCiAgICAgewogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k b20vRXhjZXB0aW9uQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXhjZXB0aW9uQmFzZS5j cHAKaW5kZXggYzkxZDg2NGJlNmM4NTgxMGNhYjkxZTU0MmRhMGI3M2Q5MTI5MDc4OS4uMjNlYmNh NjExYWQzZWViMjQzMTZmMDIxOTk1ODU3MzRlZWE1N2NlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0V4Y2VwdGlvbkJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FeGNl cHRpb25CYXNlLmNwcApAQCAtMzMsNDUgKzMzLDI5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAotRXhjZXB0aW9uQmFzZTo6RXhjZXB0aW9uQmFzZShjb25zdCBFeGNlcHRpb25Db2RlRGVzY3Jp cHRpb24mIGRlc2NyaXB0aW9uLCBNZXNzYWdlU291cmNlIG1lc3NhZ2VTb3VyY2UpCitFeGNlcHRp b25CYXNlOjpFeGNlcHRpb25CYXNlKGNvbnN0IEV4Y2VwdGlvbkNvZGVEZXNjcmlwdGlvbiYgZGVz Y3JpcHRpb24pCiAgICAgOiBtX2NvZGUoZGVzY3JpcHRpb24uY29kZSkKICAgICAsIG1fbmFtZShk ZXNjcmlwdGlvbi5uYW1lKQotICAgICwgbV9kZXNjcmlwdGlvbihkZXNjcmlwdGlvbi5kZXNjcmlw dGlvbikKKyAgICAsIG1fbWVzc2FnZShkZXNjcmlwdGlvbi5kZXNjcmlwdGlvbikKICAgICAsIG1f dHlwZU5hbWUoZGVzY3JpcHRpb24udHlwZU5hbWUpCi0gICAgLCBtX21lc3NhZ2VTb3VyY2UobWVz c2FnZVNvdXJjZSkKIHsKLSAgICBpZiAobWVzc2FnZVNvdXJjZSA9PSBNZXNzYWdlU291cmNlOjpV c2VEZXNjcmlwdGlvbikgewotICAgICAgICBtX21lc3NhZ2UgPSBtX2Rlc2NyaXB0aW9uOwotICAg ICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgaWYgKGRlc2NyaXB0aW9uLm5hbWUpCi0gICAgICAg IG1fbWVzc2FnZSA9IG1fbmFtZSArICI6ICIgKyBkZXNjcmlwdGlvbi50eXBlTmFtZSArICIgRXhj ZXB0aW9uICIgKyBTdHJpbmc6Om51bWJlcihkZXNjcmlwdGlvbi5jb2RlKTsKLSAgICBlbHNlCi0g ICAgICAgIG1fbWVzc2FnZSA9IG1ha2VTdHJpbmcoZGVzY3JpcHRpb24udHlwZU5hbWUsICIgRXhj ZXB0aW9uICIsIFN0cmluZzo6bnVtYmVyKGRlc2NyaXB0aW9uLmNvZGUpKTsKLX0KLQotU3RyaW5n IEV4Y2VwdGlvbkJhc2U6OmNvbnNvbGVFcnJvck1lc3NhZ2UoKSBjb25zdAotewotICAgIGlmICht X21lc3NhZ2VTb3VyY2UgPT0gTWVzc2FnZVNvdXJjZTo6VXNlRGVzY3JpcHRpb24pCi0gICAgICAg IHJldHVybiB0b1N0cmluZygpOwotCi0gICAgcmV0dXJuIG1ha2VTdHJpbmcobV9tZXNzYWdlLCAi OiAiLCBtX2Rlc2NyaXB0aW9uKTsKIH0KIAogU3RyaW5nIEV4Y2VwdGlvbkJhc2U6OnRvU3RyaW5n KCkgY29uc3QKIHsKLSAgICBpZiAobV9tZXNzYWdlU291cmNlICE9IE1lc3NhZ2VTb3VyY2U6OlVz ZURlc2NyaXB0aW9uKQotICAgICAgICByZXR1cm4gbWFrZVN0cmluZygiRXJyb3I6ICIsIG1fbWVz c2FnZSk7CisgICAgaWYgKCFtX3RvU3RyaW5nLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG1f dG9TdHJpbmc7CiAKICAgICBTdHJpbmcgbGFzdENvbXBvbmVudDsKLSAgICBpZiAoIW1fZGVzY3Jp cHRpb24uaXNFbXB0eSgpKQotICAgICAgICBsYXN0Q29tcG9uZW50ID0gbWFrZVN0cmluZygiOiAi LCBtX2Rlc2NyaXB0aW9uKTsKKyAgICBpZiAoIW1fbWVzc2FnZS5pc0VtcHR5KCkpCisgICAgICAg IGxhc3RDb21wb25lbnQgPSBtYWtlU3RyaW5nKCI6ICIsIG1fbWVzc2FnZSk7CiAKICAgICBpZiAo bV9uYW1lLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIG1ha2VTdHJpbmcobV90eXBlTmFtZSwg IiBFeGNlcHRpb24iLCBtX2NvZGUgPyBtYWtlU3RyaW5nKCIgIiwgU3RyaW5nOjpudW1iZXIobV9j b2RlKSkgOiAiIiwgbGFzdENvbXBvbmVudCk7CisgICAgICAgIG1fdG9TdHJpbmcgPSBtYWtlU3Ry aW5nKG1fdHlwZU5hbWUsICIgRXhjZXB0aW9uIiwgbV9jb2RlID8gbWFrZVN0cmluZygiICIsIFN0 cmluZzo6bnVtYmVyKG1fY29kZSkpIDogIiIsIGxhc3RDb21wb25lbnQpOworICAgIGVsc2UKKyAg ICAgICAgbV90b1N0cmluZyA9IG1ha2VTdHJpbmcobV9uYW1lLCAiICgiLCBtX3R5cGVOYW1lLCAi IEV4Y2VwdGlvbiIsIG1fY29kZSA/IG1ha2VTdHJpbmcoIiAiLCBTdHJpbmc6Om51bWJlcihtX2Nv ZGUpKSA6ICIiLCAiKSIsIGxhc3RDb21wb25lbnQpOwogCi0gICAgcmV0dXJuIG1ha2VTdHJpbmco bV9uYW1lLCAiICgiLCBtX3R5cGVOYW1lLCAiIEV4Y2VwdGlvbiIsIG1fY29kZSA/IG1ha2VTdHJp bmcoIiAiLCBTdHJpbmc6Om51bWJlcihtX2NvZGUpKSA6ICIiLCAiKSIsIGxhc3RDb21wb25lbnQp OworICAgIHJldHVybiBtX3RvU3RyaW5nOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXhjZXB0aW9uQmFzZS5oIGIvU291cmNlL1dl YkNvcmUvZG9tL0V4Y2VwdGlvbkJhc2UuaAppbmRleCA5NzRlMWE0ODczMWI5MjAxOWJmYzRmNzEy YTZjOTM2N2E5MDc0MjFmLi5hZmRjOTM3NDBlZmM2MTgyNjk1NDk5NjRmMGZiMjMxNjEzOGIwMTc0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXhjZXB0aW9uQmFzZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9FeGNlcHRpb25CYXNlLmgKQEAgLTQyLDI4ICs0MiwxOCBAQCBwdWJs aWM6CiAgICAgdW5zaWduZWQgc2hvcnQgY29kZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29kZTsgfQog ICAgIFN0cmluZyBuYW1lKCkgY29uc3QgeyByZXR1cm4gbV9uYW1lOyB9CiAgICAgU3RyaW5nIG1l c3NhZ2UoKSBjb25zdCB7IHJldHVybiBtX21lc3NhZ2U7IH0KLSAgICBTdHJpbmcgZGVzY3JpcHRp b24oKSBjb25zdCB7IHJldHVybiBtX2Rlc2NyaXB0aW9uOyB9CiAKICAgICBTdHJpbmcgdG9TdHJp bmcoKSBjb25zdDsKIAotICAgIC8vIEZJWE1FOiBjb25zb2xlRXJyb3JNZXNzYWdlIGlzIG5lZWRl ZCB0ZW1wb3JhcmlseSB3aGlsZSBidWcgMTU5ODIyIGlzIGluIHByb2dyZXNzLgotICAgIC8vIE9u Y2UgMTU5ODIyIGlzIGNvbXBsZXRlLCBjb25zb2xlRXJyb3JNZXNzYWdlIGNhbiBiZSBkcm9wcGVk IGFuZCBpdHMgY2FsbGVycyB3aWxsIHVzZSB0b1N0cmluZyBpbnN0ZWFkLgotICAgIFN0cmluZyBj b25zb2xlRXJyb3JNZXNzYWdlKCkgY29uc3Q7Ci0KIHByb3RlY3RlZDoKLSAgICBlbnVtIGNsYXNz IE1lc3NhZ2VTb3VyY2UgewotICAgICAgICBDb25zdHJ1Y3RNZXNzYWdlLAotICAgICAgICBVc2VE ZXNjcmlwdGlvbiwKLSAgICB9OwotICAgIGV4cGxpY2l0IEV4Y2VwdGlvbkJhc2UoY29uc3QgRXhj ZXB0aW9uQ29kZURlc2NyaXB0aW9uJiwgTWVzc2FnZVNvdXJjZSA9IE1lc3NhZ2VTb3VyY2U6OkNv bnN0cnVjdE1lc3NhZ2UpOworICAgIGV4cGxpY2l0IEV4Y2VwdGlvbkJhc2UoY29uc3QgRXhjZXB0 aW9uQ29kZURlc2NyaXB0aW9uJik7CiAKIHByaXZhdGU6CiAgICAgdW5zaWduZWQgc2hvcnQgbV9j b2RlOwogICAgIFN0cmluZyBtX25hbWU7CiAgICAgU3RyaW5nIG1fbWVzc2FnZTsKLSAgICBTdHJp bmcgbV9kZXNjcmlwdGlvbjsKICAgICBTdHJpbmcgbV90eXBlTmFtZTsKLSAgICBNZXNzYWdlU291 cmNlIG1fbWVzc2FnZVNvdXJjZTsKKyAgICBtdXRhYmxlIFN0cmluZyBtX3RvU3RyaW5nOwogfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3Zn L1NWR0V4Y2VwdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0V4Y2VwdGlvbi5oCmluZGV4 IGI4MmUwZTQ1MzVkNDc5NDFkYTJlMGE0NjMzMTE3NjJkYjMyYTE4YmMuLmJiZGE2MDYxODkxMDli ODhhYjY0Mzg3MWMzNjU3ZjVlMDFhYzUyZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdFeGNlcHRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRXhjZXB0aW9uLmgK QEAgLTQ1LDcgKzQ1LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIFNWR0V4Y2VwdGlvbihj b25zdCBFeGNlcHRpb25Db2RlRGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uKQotICAgICAgICA6IEV4 Y2VwdGlvbkJhc2UoZGVzY3JpcHRpb24sIEV4Y2VwdGlvbkJhc2U6Ok1lc3NhZ2VTb3VyY2U6OlVz ZURlc2NyaXB0aW9uKQorICAgICAgICA6IEV4Y2VwdGlvbkJhc2UoZGVzY3JpcHRpb24pCiAgICAg ewogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhFeGNlcHRp b24uaCBiL1NvdXJjZS9XZWJDb3JlL3htbC9YUGF0aEV4Y2VwdGlvbi5oCmluZGV4IDUwZmJiNzlm ZjZjMWFlZGNjMzA5YjkyODUyNDU4ZmM1ZDVlZTU0OGEuLjFjYjNlNzQyOGZkMzY2MDFlMGVhNDJj MGUyYTUzNjU0YjhjMzM4OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3htbC9YUGF0aEV4 Y2VwdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YUGF0aEV4Y2VwdGlvbi5oCkBAIC01 Miw3ICs1Miw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBYUGF0aEV4Y2Vw dGlvbihjb25zdCBFeGNlcHRpb25Db2RlRGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uKQotICAgICAg ICA6IEV4Y2VwdGlvbkJhc2UoZGVzY3JpcHRpb24sIEV4Y2VwdGlvbkJhc2U6Ok1lc3NhZ2VTb3Vy Y2U6OlVzZURlc2NyaXB0aW9uKQorICAgICAgICA6IEV4Y2VwdGlvbkJhc2UoZGVzY3JpcHRpb24p CiAgICAgewogICAgIH0KIH07Cg==