62377 2011-06-09 07:47:55 -0700 Web Inspector: protocol: json: Whitespace can be inserted between any pair of tokens. 2011-06-10 01:40:17 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 62440 0 loislo loislo apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 418015 0 loislo 2011-06-09 07:47:55 -0700 What steps will reproduce the problem? 1. Connect to the remote debugging websocket via a script (not a browser) 2. send the following JSON message '{"id":1, "method":"Console.enable"}' (note the space between the first value and the second key) What is the expected result? Chrome returns a success response. What happens instead? Chrome returned the following error: {"error":{"code":-32700,"message":"Parse error.","data":["Message should be in JSON format."]},"id":null} Please provide any additional information below: If I remove the whitespace between the first value and the next key I get back a successful response. UserAgentString: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.36 (KHTML, like Gecko) Chrome/13.0.767.1 Safari/534.36 418026 1 96591 loislo 2011-06-09 08:10:50 -0700 Created attachment 96591 [patch] initial version 418535 2 96591 yurys 2011-06-09 23:31:35 -0700 Comment on attachment 96591 [patch] initial version View in context: https://bugs.webkit.org/attachment.cgi?id=96591&action=review > Source/WebCore/inspector/InspectorValues.cpp:189 > +Token parseToken(const UChar*& start, const UChar* end, const UChar** tokenEnd) Let's split input start and output tokenStart. 418577 3 96711 loislo 2011-06-10 01:30:55 -0700 Created attachment 96711 [patch] second version comments addressed 418583 4 loislo 2011-06-10 01:33:27 -0700 Committed r88530: <http://trac.webkit.org/changeset/88530> 96591 2011-06-09 08:10:50 -0700 2011-06-10 01:30:55 -0700 [patch] initial version patch text/plain 5090 loislo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxZDRhYzI2Li40MzM0Yjk0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYt MDkgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHByb3Rv Y29sOiBqc29uOiBXaGl0ZXNwYWNlIGNhbiBiZSBpbnNlcnRlZCBiZXR3ZWVuIGFueSBwYWlyIG9m IHRva2Vucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYyMzc3CisKKyAgICAgICAgKiBpbnNwZWN0b3IvcmVwb3J0LXByb3RvY29sLWVycm9ycy1leHBl Y3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL3JlcG9ydC1wcm90b2NvbC1lcnJvcnMuaHRt bDoKKwogMjAxMS0wNi0wOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgog CiAgICAgICAgIFtRdF0gVW5yZXZpZXdlZCBmaXggYWZ0ZXIgcjg4NDQ3LgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3JlcG9ydC1wcm90b2NvbC1lcnJvcnMtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3JlcG9ydC1wcm90b2NvbC1lcnJvcnMtZXhwZWN0ZWQu dHh0CmluZGV4IDNiOGMyODkuLjYwMzQxYmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9yZXBvcnQtcHJvdG9jb2wtZXJyb3JzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvcmVwb3J0LXByb3RvY29sLWVycm9ycy1leHBlY3RlZC50eHQKQEAgLTEwMSw0 ICsxMDEsOTQgQEAgVGVzdHMgdGhhdCBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlciBpcyBjYXRj aGluZyBpbmNvcnJlY3QgbWVzc2FnZXMuCiAgICAgfQogICAgIGlkIDogNwogfQoreworICAgIGVy cm9yIDogeworICAgICAgICBjb2RlIDogLTMyNjAxCisgICAgICAgIG1lc3NhZ2UgOiAiTWV0aG9k IG5vdCBmb3VuZC4iCisgICAgICAgIGRhdGEgOiBbCisgICAgICAgICAgICAiSW52YWxpZCBtZXRo b2QgbmFtZSB3YXMgcmVjZWl2ZWQuICdQYWdlLnRlc3QnIHdhc24ndCBmb3VuZC4iCisgICAgICAg IF0KKyAgICB9CisgICAgaWQgOiA4Cit9Cit7CisgICAgZXJyb3IgOiB7CisgICAgICAgIGNvZGUg OiAtMzI2MDEKKyAgICAgICAgbWVzc2FnZSA6ICJNZXRob2Qgbm90IGZvdW5kLiIKKyAgICAgICAg ZGF0YSA6IFsKKyAgICAgICAgICAgICJJbnZhbGlkIG1ldGhvZCBuYW1lIHdhcyByZWNlaXZlZC4g J1BhZ2UudGVzdCcgd2Fzbid0IGZvdW5kLiIKKyAgICAgICAgXQorICAgIH0KKyAgICBpZCA6IDkK K30KK3sKKyAgICBlcnJvciA6IHsKKyAgICAgICAgY29kZSA6IC0zMjYwMQorICAgICAgICBtZXNz YWdlIDogIk1ldGhvZCBub3QgZm91bmQuIgorICAgICAgICBkYXRhIDogWworICAgICAgICAgICAg IkludmFsaWQgbWV0aG9kIG5hbWUgd2FzIHJlY2VpdmVkLiAnUGFnZS50ZXN0JyB3YXNuJ3QgZm91 bmQuIgorICAgICAgICBdCisgICAgfQorICAgIGlkIDogMTAKK30KK3sKKyAgICBlcnJvciA6IHsK KyAgICAgICAgY29kZSA6IC0zMjYwMQorICAgICAgICBtZXNzYWdlIDogIk1ldGhvZCBub3QgZm91 bmQuIgorICAgICAgICBkYXRhIDogWworICAgICAgICAgICAgIkludmFsaWQgbWV0aG9kIG5hbWUg d2FzIHJlY2VpdmVkLiAnUGFnZS50ZXN0JyB3YXNuJ3QgZm91bmQuIgorICAgICAgICBdCisgICAg fQorICAgIGlkIDogMTEKK30KK3sKKyAgICBlcnJvciA6IHsKKyAgICAgICAgY29kZSA6IC0zMjYw MQorICAgICAgICBtZXNzYWdlIDogIk1ldGhvZCBub3QgZm91bmQuIgorICAgICAgICBkYXRhIDog WworICAgICAgICAgICAgIkludmFsaWQgbWV0aG9kIG5hbWUgd2FzIHJlY2VpdmVkLiAnUGFnZS50 ZXN0JyB3YXNuJ3QgZm91bmQuIgorICAgICAgICBdCisgICAgfQorICAgIGlkIDogMTIKK30KK3sK KyAgICBlcnJvciA6IHsKKyAgICAgICAgY29kZSA6IC0zMjYwMQorICAgICAgICBtZXNzYWdlIDog Ik1ldGhvZCBub3QgZm91bmQuIgorICAgICAgICBkYXRhIDogWworICAgICAgICAgICAgIkludmFs aWQgbWV0aG9kIG5hbWUgd2FzIHJlY2VpdmVkLiAnUGFnZS50ZXN0JyB3YXNuJ3QgZm91bmQuIgor ICAgICAgICBdCisgICAgfQorICAgIGlkIDogMTMKK30KK3sKKyAgICBlcnJvciA6IHsKKyAgICAg ICAgY29kZSA6IC0zMjYwMQorICAgICAgICBtZXNzYWdlIDogIk1ldGhvZCBub3QgZm91bmQuIgor ICAgICAgICBkYXRhIDogWworICAgICAgICAgICAgIkludmFsaWQgbWV0aG9kIG5hbWUgd2FzIHJl Y2VpdmVkLiAnUGFnZS50ZXN0JyB3YXNuJ3QgZm91bmQuIgorICAgICAgICBdCisgICAgfQorICAg IGlkIDogMTQKK30KK3sKKyAgICBlcnJvciA6IHsKKyAgICAgICAgY29kZSA6IC0zMjYwMQorICAg ICAgICBtZXNzYWdlIDogIk1ldGhvZCBub3QgZm91bmQuIgorICAgICAgICBkYXRhIDogWworICAg ICAgICAgICAgIkludmFsaWQgbWV0aG9kIG5hbWUgd2FzIHJlY2VpdmVkLiAnUGFnZS50ZXN0JyB3 YXNuJ3QgZm91bmQuIgorICAgICAgICBdCisgICAgfQorICAgIGlkIDogMTUKK30KK3sKKyAgICBl cnJvciA6IHsKKyAgICAgICAgY29kZSA6IC0zMjYwMQorICAgICAgICBtZXNzYWdlIDogIk1ldGhv ZCBub3QgZm91bmQuIgorICAgICAgICBkYXRhIDogWworICAgICAgICAgICAgIkludmFsaWQgbWV0 aG9kIG5hbWUgd2FzIHJlY2VpdmVkLiAnUGFnZS50ZXN0JyB3YXNuJ3QgZm91bmQuIgorICAgICAg ICBdCisgICAgfQorICAgIGlkIDogMTYKK30KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3JlcG9ydC1wcm90b2NvbC1lcnJvcnMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9yZXBvcnQtcHJvdG9jb2wtZXJyb3JzLmh0bWwKaW5kZXggNTMwYTBhNi4uYWI0MTU2NCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3JlcG9ydC1wcm90b2NvbC1lcnJvcnMuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcmVwb3J0LXByb3RvY29sLWVycm9ycy5odG1s CkBAIC0xNiw2ICsxNiwxNSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgJ3siaWQiOjUsIm1l dGhvZCI6IlBhZ2UuZ2V0UmVzb3VyY2VDb250ZW50IiwicGFyYW1zIjpbXX0nLAogICAgICAgICAn eyJpZCI6NiwibWV0aG9kIjoiUGFnZS5nZXRSZXNvdXJjZUNvbnRlbnQiLCJwYXJhbXMiOnt9fScs CiAgICAgICAgICd7ImlkIjo3LCJtZXRob2QiOiJQYWdlLmdldFJlc291cmNlQ29udGVudCIsInBh cmFtcyI6eyJmcmFtZUlkIjoibm90IGEgbnVtYmVyIn19JywKKyAgICAgICAgJ3siaWQiOjgsIm1l dGhvZCI6IlBhZ2UudGVzdCJ9JywKKyAgICAgICAgJ3siaWQiOjksIm1ldGhvZCI6IlBhZ2UudGVz dCIgfScsCisgICAgICAgICd7ImlkIjoxMCwibWV0aG9kIjogIlBhZ2UudGVzdCIgfScsCisgICAg ICAgICd7ImlkIjoxMSwibWV0aG9kIiA6ICJQYWdlLnRlc3QiIH0nLAorICAgICAgICAneyJpZCI6 MTIsICJtZXRob2QiIDogIlBhZ2UudGVzdCIgfScsCisgICAgICAgICd7ImlkIjogMTMsICJtZXRo b2QiIDogIlBhZ2UudGVzdCIgfScsCisgICAgICAgICd7ImlkIiA6IDE0LCAibWV0aG9kIiA6ICJQ YWdlLnRlc3QiIH0nLAorICAgICAgICAneyAiaWQiIDogMTUsICJtZXRob2QiIDogIlBhZ2UudGVz dCIgfScsCisgICAgICAgICd7ICAiaWQiXG4gOlxyIDE2LFx0ICJtZXRob2QiXGYgOlx2ICJQYWdl LnRlc3QiIH0nLAogICAgIF07CiAgICAgdmFyIG51bWJlck9mUmVwb3J0cyA9IDA7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCBjOGU3MWQ1Li45NTQyM2JjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIw MTEtMDYtMDkgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IHByb3RvY29sOiBqc29uOiBXaGl0ZXNwYWNlIGNhbiBiZSBpbnNlcnRlZCBiZXR3ZWVuIGFueSBw YWlyIG9mIHRva2Vucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTYyMzc3CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVmFsdWVzLmNwcDoK KwogMjAxMS0wNi0wOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFtRdF1bTWFjXSBTcGVjdWxhdGl2ZSBidWlsZGZpeCBhZnRlciByODgyODYuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVmFsdWVzLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JWYWx1ZXMuY3BwCmluZGV4IGM4MGRlNTEu LjgwNmRjMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JW YWx1ZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JWYWx1ZXMu Y3BwCkBAIC0xODYsOCArMTg2LDExIEBAIGJvb2wgcGFyc2VTdHJpbmdUb2tlbihjb25zdCBVQ2hh ciogc3RhcnQsIGNvbnN0IFVDaGFyKiBlbmQsIGNvbnN0IFVDaGFyKiogdG9rZW5FCiAgICAgcmV0 dXJuIGZhbHNlOwogfQogCi1Ub2tlbiBwYXJzZVRva2VuKGNvbnN0IFVDaGFyKiBzdGFydCwgY29u c3QgVUNoYXIqIGVuZCwgY29uc3QgVUNoYXIqKiB0b2tlbkVuZCkKK1Rva2VuIHBhcnNlVG9rZW4o Y29uc3QgVUNoYXIqJiBzdGFydCwgY29uc3QgVUNoYXIqIGVuZCwgY29uc3QgVUNoYXIqKiB0b2tl bkVuZCkKIHsKKyAgICB3aGlsZSAoc3RhcnQgPCBlbmQgJiYgdV9pc3NwYWNlKCpzdGFydCkpCisg ICAgICAgICsrc3RhcnQ7CisKICAgICBpZiAoc3RhcnQgPT0gZW5kKQogICAgICAgICByZXR1cm4g SU5WQUxJRF9UT0tFTjsKIAo= 96711 2011-06-10 01:30:55 -0700 2011-06-10 01:32:34 -0700 [patch] second version patch text/plain 9130 loislo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4MzcxMTg4Li4yNTgwYTYwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYt MDkgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHByb3Rv Y29sOiBqc29uOiBXaGl0ZXNwYWNlIGNhbiBiZSBpbnNlcnRlZCBiZXR3ZWVuIGFueSBwYWlyIG9m IHRva2Vucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYyMzc3CisKKyAgICAgICAgKiBpbnNwZWN0b3IvcmVwb3J0LXByb3RvY29sLWVycm9ycy1leHBl Y3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL3JlcG9ydC1wcm90b2NvbC1lcnJvcnMuaHRt bDoKKwogMjAxMS0wNi0xMCAgTWFoZXNoIEt1bGthcm5pICA8bWFoZXNoLmt1bGthcm5pQG5va2lh LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3JlcG9ydC1wcm90b2NvbC1lcnJvcnMtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3JlcG9ydC1wcm90b2NvbC1lcnJvcnMtZXhwZWN0ZWQu dHh0CmluZGV4IDNiOGMyODkuLjYwMzQxYmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9yZXBvcnQtcHJvdG9jb2wtZXJyb3JzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvcmVwb3J0LXByb3RvY29sLWVycm9ycy1leHBlY3RlZC50eHQKQEAgLTEwMSw0 ICsxMDEsOTQgQEAgVGVzdHMgdGhhdCBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlciBpcyBjYXRj aGluZyBpbmNvcnJlY3QgbWVzc2FnZXMuCiAgICAgfQogICAgIGlkIDogNwogfQoreworICAgIGVy cm9yIDogeworICAgICAgICBjb2RlIDogLTMyNjAxCisgICAgICAgIG1lc3NhZ2UgOiAiTWV0aG9k IG5vdCBmb3VuZC4iCisgICAgICAgIGRhdGEgOiBbCisgICAgICAgICAgICAiSW52YWxpZCBtZXRo b2QgbmFtZSB3YXMgcmVjZWl2ZWQuICdQYWdlLnRlc3QnIHdhc24ndCBmb3VuZC4iCisgICAgICAg IF0KKyAgICB9CisgICAgaWQgOiA4Cit9Cit7CisgICAgZXJyb3IgOiB7CisgICAgICAgIGNvZGUg OiAtMzI2MDEKKyAgICAgICAgbWVzc2FnZSA6ICJNZXRob2Qgbm90IGZvdW5kLiIKKyAgICAgICAg ZGF0YSA6IFsKKyAgICAgICAgICAgICJJbnZhbGlkIG1ldGhvZCBuYW1lIHdhcyByZWNlaXZlZC4g J1BhZ2UudGVzdCcgd2Fzbid0IGZvdW5kLiIKKyAgICAgICAgXQorICAgIH0KKyAgICBpZCA6IDkK K30KK3sKKyAgICBlcnJvciA6IHsKKyAgICAgICAgY29kZSA6IC0zMjYwMQorICAgICAgICBtZXNz YWdlIDogIk1ldGhvZCBub3QgZm91bmQuIgorICAgICAgICBkYXRhIDogWworICAgICAgICAgICAg IkludmFsaWQgbWV0aG9kIG5hbWUgd2FzIHJlY2VpdmVkLiAnUGFnZS50ZXN0JyB3YXNuJ3QgZm91 bmQuIgorICAgICAgICBdCisgICAgfQorICAgIGlkIDogMTAKK30KK3sKKyAgICBlcnJvciA6IHsK KyAgICAgICAgY29kZSA6IC0zMjYwMQorICAgICAgICBtZXNzYWdlIDogIk1ldGhvZCBub3QgZm91 bmQuIgorICAgICAgICBkYXRhIDogWworICAgICAgICAgICAgIkludmFsaWQgbWV0aG9kIG5hbWUg d2FzIHJlY2VpdmVkLiAnUGFnZS50ZXN0JyB3YXNuJ3QgZm91bmQuIgorICAgICAgICBdCisgICAg fQorICAgIGlkIDogMTEKK30KK3sKKyAgICBlcnJvciA6IHsKKyAgICAgICAgY29kZSA6IC0zMjYw MQorICAgICAgICBtZXNzYWdlIDogIk1ldGhvZCBub3QgZm91bmQuIgorICAgICAgICBkYXRhIDog WworICAgICAgICAgICAgIkludmFsaWQgbWV0aG9kIG5hbWUgd2FzIHJlY2VpdmVkLiAnUGFnZS50 ZXN0JyB3YXNuJ3QgZm91bmQuIgorICAgICAgICBdCisgICAgfQorICAgIGlkIDogMTIKK30KK3sK KyAgICBlcnJvciA6IHsKKyAgICAgICAgY29kZSA6IC0zMjYwMQorICAgICAgICBtZXNzYWdlIDog Ik1ldGhvZCBub3QgZm91bmQuIgorICAgICAgICBkYXRhIDogWworICAgICAgICAgICAgIkludmFs aWQgbWV0aG9kIG5hbWUgd2FzIHJlY2VpdmVkLiAnUGFnZS50ZXN0JyB3YXNuJ3QgZm91bmQuIgor ICAgICAgICBdCisgICAgfQorICAgIGlkIDogMTMKK30KK3sKKyAgICBlcnJvciA6IHsKKyAgICAg ICAgY29kZSA6IC0zMjYwMQorICAgICAgICBtZXNzYWdlIDogIk1ldGhvZCBub3QgZm91bmQuIgor ICAgICAgICBkYXRhIDogWworICAgICAgICAgICAgIkludmFsaWQgbWV0aG9kIG5hbWUgd2FzIHJl Y2VpdmVkLiAnUGFnZS50ZXN0JyB3YXNuJ3QgZm91bmQuIgorICAgICAgICBdCisgICAgfQorICAg IGlkIDogMTQKK30KK3sKKyAgICBlcnJvciA6IHsKKyAgICAgICAgY29kZSA6IC0zMjYwMQorICAg ICAgICBtZXNzYWdlIDogIk1ldGhvZCBub3QgZm91bmQuIgorICAgICAgICBkYXRhIDogWworICAg ICAgICAgICAgIkludmFsaWQgbWV0aG9kIG5hbWUgd2FzIHJlY2VpdmVkLiAnUGFnZS50ZXN0JyB3 YXNuJ3QgZm91bmQuIgorICAgICAgICBdCisgICAgfQorICAgIGlkIDogMTUKK30KK3sKKyAgICBl cnJvciA6IHsKKyAgICAgICAgY29kZSA6IC0zMjYwMQorICAgICAgICBtZXNzYWdlIDogIk1ldGhv ZCBub3QgZm91bmQuIgorICAgICAgICBkYXRhIDogWworICAgICAgICAgICAgIkludmFsaWQgbWV0 aG9kIG5hbWUgd2FzIHJlY2VpdmVkLiAnUGFnZS50ZXN0JyB3YXNuJ3QgZm91bmQuIgorICAgICAg ICBdCisgICAgfQorICAgIGlkIDogMTYKK30KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3JlcG9ydC1wcm90b2NvbC1lcnJvcnMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9yZXBvcnQtcHJvdG9jb2wtZXJyb3JzLmh0bWwKaW5kZXggNTMwYTBhNi4uYWI0MTU2NCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3JlcG9ydC1wcm90b2NvbC1lcnJvcnMuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcmVwb3J0LXByb3RvY29sLWVycm9ycy5odG1s CkBAIC0xNiw2ICsxNiwxNSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgJ3siaWQiOjUsIm1l dGhvZCI6IlBhZ2UuZ2V0UmVzb3VyY2VDb250ZW50IiwicGFyYW1zIjpbXX0nLAogICAgICAgICAn eyJpZCI6NiwibWV0aG9kIjoiUGFnZS5nZXRSZXNvdXJjZUNvbnRlbnQiLCJwYXJhbXMiOnt9fScs CiAgICAgICAgICd7ImlkIjo3LCJtZXRob2QiOiJQYWdlLmdldFJlc291cmNlQ29udGVudCIsInBh cmFtcyI6eyJmcmFtZUlkIjoibm90IGEgbnVtYmVyIn19JywKKyAgICAgICAgJ3siaWQiOjgsIm1l dGhvZCI6IlBhZ2UudGVzdCJ9JywKKyAgICAgICAgJ3siaWQiOjksIm1ldGhvZCI6IlBhZ2UudGVz dCIgfScsCisgICAgICAgICd7ImlkIjoxMCwibWV0aG9kIjogIlBhZ2UudGVzdCIgfScsCisgICAg ICAgICd7ImlkIjoxMSwibWV0aG9kIiA6ICJQYWdlLnRlc3QiIH0nLAorICAgICAgICAneyJpZCI6 MTIsICJtZXRob2QiIDogIlBhZ2UudGVzdCIgfScsCisgICAgICAgICd7ImlkIjogMTMsICJtZXRo b2QiIDogIlBhZ2UudGVzdCIgfScsCisgICAgICAgICd7ImlkIiA6IDE0LCAibWV0aG9kIiA6ICJQ YWdlLnRlc3QiIH0nLAorICAgICAgICAneyAiaWQiIDogMTUsICJtZXRob2QiIDogIlBhZ2UudGVz dCIgfScsCisgICAgICAgICd7ICAiaWQiXG4gOlxyIDE2LFx0ICJtZXRob2QiXGYgOlx2ICJQYWdl LnRlc3QiIH0nLAogICAgIF07CiAgICAgdmFyIG51bWJlck9mUmVwb3J0cyA9IDA7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCAxM2Y5MTUwLi5kNDlkYTZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIw MTEtMDYtMDkgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IHByb3RvY29sOiBqc29uOiBXaGl0ZXNwYWNlIGNhbiBiZSBpbnNlcnRlZCBiZXR3ZWVuIGFueSBw YWlyIG9mIHRva2Vucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTYyMzc3CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVmFsdWVzLmNwcDoK KwogMjAxMS0wNi0wOSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JWYWx1ZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclZhbHVlcy5jcHAKaW5kZXggYzgwZGU1MS4uMmU3Mjk5NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclZhbHVlcy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclZhbHVlcy5jcHAKQEAgLTE4NiwxMSArMTg2LDE2IEBA IGJvb2wgcGFyc2VTdHJpbmdUb2tlbihjb25zdCBVQ2hhciogc3RhcnQsIGNvbnN0IFVDaGFyKiBl bmQsIGNvbnN0IFVDaGFyKiogdG9rZW5FCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1Ub2tlbiBw YXJzZVRva2VuKGNvbnN0IFVDaGFyKiBzdGFydCwgY29uc3QgVUNoYXIqIGVuZCwgY29uc3QgVUNo YXIqKiB0b2tlbkVuZCkKK1Rva2VuIHBhcnNlVG9rZW4oY29uc3QgVUNoYXIqIHN0YXJ0LCBjb25z dCBVQ2hhciogZW5kLCBjb25zdCBVQ2hhcioqIHRva2VuU3RhcnQsIGNvbnN0IFVDaGFyKiogdG9r ZW5FbmQpCiB7CisgICAgd2hpbGUgKHN0YXJ0IDwgZW5kICYmIHVfaXNzcGFjZSgqc3RhcnQpKQor ICAgICAgICArK3N0YXJ0OworCiAgICAgaWYgKHN0YXJ0ID09IGVuZCkKICAgICAgICAgcmV0dXJu IElOVkFMSURfVE9LRU47CiAKKyAgICAqdG9rZW5TdGFydCA9IHN0YXJ0OworCiAgICAgc3dpdGNo ICgqc3RhcnQpIHsKICAgICBjYXNlICduJzoKICAgICAgICAgaWYgKHBhcnNlQ29uc3RUb2tlbihz dGFydCwgZW5kLCB0b2tlbkVuZCwgbnVsbFN0cmluZykpCkBAIC0zMzAsOCArMzM1LDkgQEAgUGFz c1JlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gYnVpbGRWYWx1ZShjb25zdCBVQ2hhciogc3RhcnQsIGNv bnN0IFVDaGFyKiBlbmQsIGNvbnMKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBSZWZQdHI8SW5z cGVjdG9yVmFsdWU+IHJlc3VsdDsKKyAgICBjb25zdCBVQ2hhciogdG9rZW5TdGFydDsKICAgICBj b25zdCBVQ2hhciogdG9rZW5FbmQ7Ci0gICAgVG9rZW4gdG9rZW4gPSBwYXJzZVRva2VuKHN0YXJ0 LCBlbmQsICZ0b2tlbkVuZCk7CisgICAgVG9rZW4gdG9rZW4gPSBwYXJzZVRva2VuKHN0YXJ0LCBl bmQsICZ0b2tlblN0YXJ0LCAmdG9rZW5FbmQpOwogICAgIHN3aXRjaCAodG9rZW4pIHsKICAgICBj YXNlIElOVkFMSURfVE9LRU46CiAgICAgICAgIHJldHVybiAwOwpAQCAtMzQ2LDcgKzM1Miw3IEBA IFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IGJ1aWxkVmFsdWUoY29uc3QgVUNoYXIqIHN0YXJ0 LCBjb25zdCBVQ2hhciogZW5kLCBjb25zCiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTlVNQkVS OiB7CiAgICAgICAgIGJvb2wgb2s7Ci0gICAgICAgIGRvdWJsZSB2YWx1ZSA9IGNoYXJhY3RlcnNU b0RvdWJsZShzdGFydCwgdG9rZW5FbmQgLSBzdGFydCwgJm9rKTsKKyAgICAgICAgZG91YmxlIHZh bHVlID0gY2hhcmFjdGVyc1RvRG91YmxlKHRva2VuU3RhcnQsIHRva2VuRW5kIC0gdG9rZW5TdGFy dCwgJm9rKTsKICAgICAgICAgaWYgKCFvaykKICAgICAgICAgICAgIHJldHVybiAwOwogICAgICAg ICByZXN1bHQgPSBJbnNwZWN0b3JCYXNpY1ZhbHVlOjpjcmVhdGUodmFsdWUpOwpAQCAtMzU0LDcg KzM2MCw3IEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IGJ1aWxkVmFsdWUoY29uc3QgVUNo YXIqIHN0YXJ0LCBjb25zdCBVQ2hhciogZW5kLCBjb25zCiAgICAgfQogICAgIGNhc2UgU1RSSU5H OiB7CiAgICAgICAgIFN0cmluZyB2YWx1ZTsKLSAgICAgICAgYm9vbCBvayA9IGRlY29kZVN0cmlu ZyhzdGFydCArIDEsIHRva2VuRW5kIC0gMSwgJnZhbHVlKTsKKyAgICAgICAgYm9vbCBvayA9IGRl Y29kZVN0cmluZyh0b2tlblN0YXJ0ICsgMSwgdG9rZW5FbmQgLSAxLCAmdmFsdWUpOwogICAgICAg ICBpZiAoIW9rKQogICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIHJlc3VsdCA9IEluc3Bl Y3RvclN0cmluZzo6Y3JlYXRlKHZhbHVlKTsKQEAgLTM2Myw3ICszNjksNyBAQCBQYXNzUmVmUHRy PEluc3BlY3RvclZhbHVlPiBidWlsZFZhbHVlKGNvbnN0IFVDaGFyKiBzdGFydCwgY29uc3QgVUNo YXIqIGVuZCwgY29ucwogICAgIGNhc2UgQVJSQVlfQkVHSU46IHsKICAgICAgICAgUmVmUHRyPElu c3BlY3RvckFycmF5PiBhcnJheSA9IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKICAgICAgICAg c3RhcnQgPSB0b2tlbkVuZDsKLSAgICAgICAgdG9rZW4gPSBwYXJzZVRva2VuKHN0YXJ0LCBlbmQs ICZ0b2tlbkVuZCk7CisgICAgICAgIHRva2VuID0gcGFyc2VUb2tlbihzdGFydCwgZW5kLCAmdG9r ZW5TdGFydCwgJnRva2VuRW5kKTsKICAgICAgICAgd2hpbGUgKHRva2VuICE9IEFSUkFZX0VORCkg ewogICAgICAgICAgICAgUmVmUHRyPEluc3BlY3RvclZhbHVlPiBhcnJheU5vZGUgPSBidWlsZFZh bHVlKHN0YXJ0LCBlbmQsICZ0b2tlbkVuZCwgZGVwdGggKyAxKTsKICAgICAgICAgICAgIGlmICgh YXJyYXlOb2RlKQpAQCAtMzcyLDEwICszNzgsMTAgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1 ZT4gYnVpbGRWYWx1ZShjb25zdCBVQ2hhciogc3RhcnQsIGNvbnN0IFVDaGFyKiBlbmQsIGNvbnMK IAogICAgICAgICAgICAgLy8gQWZ0ZXIgYSBsaXN0IHZhbHVlLCB3ZSBleHBlY3QgYSBjb21tYSBv ciB0aGUgZW5kIG9mIHRoZSBsaXN0LgogICAgICAgICAgICAgc3RhcnQgPSB0b2tlbkVuZDsKLSAg ICAgICAgICAgIHRva2VuID0gcGFyc2VUb2tlbihzdGFydCwgZW5kLCAmdG9rZW5FbmQpOworICAg ICAgICAgICAgdG9rZW4gPSBwYXJzZVRva2VuKHN0YXJ0LCBlbmQsICZ0b2tlblN0YXJ0LCAmdG9r ZW5FbmQpOwogICAgICAgICAgICAgaWYgKHRva2VuID09IExJU1RfU0VQQVJBVE9SKSB7CiAgICAg ICAgICAgICAgICAgc3RhcnQgPSB0b2tlbkVuZDsKLSAgICAgICAgICAgICAgICB0b2tlbiA9IHBh cnNlVG9rZW4oc3RhcnQsIGVuZCwgJnRva2VuRW5kKTsKKyAgICAgICAgICAgICAgICB0b2tlbiA9 IHBhcnNlVG9rZW4oc3RhcnQsIGVuZCwgJnRva2VuU3RhcnQsICZ0b2tlbkVuZCk7CiAgICAgICAg ICAgICAgICAgaWYgKHRva2VuID09IEFSUkFZX0VORCkKICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIDA7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKHRva2VuICE9IEFSUkFZX0VORCkgewpAQCAt MzkxLDE2ICszOTcsMTYgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gYnVpbGRWYWx1ZShj b25zdCBVQ2hhciogc3RhcnQsIGNvbnN0IFVDaGFyKiBlbmQsIGNvbnMKICAgICBjYXNlIE9CSkVD VF9CRUdJTjogewogICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBvYmplY3QgPSBJbnNw ZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwogICAgICAgICBzdGFydCA9IHRva2VuRW5kOwotICAgICAg ICB0b2tlbiA9IHBhcnNlVG9rZW4oc3RhcnQsIGVuZCwgJnRva2VuRW5kKTsKKyAgICAgICAgdG9r ZW4gPSBwYXJzZVRva2VuKHN0YXJ0LCBlbmQsICZ0b2tlblN0YXJ0LCAmdG9rZW5FbmQpOwogICAg ICAgICB3aGlsZSAodG9rZW4gIT0gT0JKRUNUX0VORCkgewogICAgICAgICAgICAgaWYgKHRva2Vu ICE9IFNUUklORykKICAgICAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgICAgIFN0cmlu ZyBrZXk7Ci0gICAgICAgICAgICBpZiAoIWRlY29kZVN0cmluZyhzdGFydCArIDEsIHRva2VuRW5k IC0gMSwgJmtleSkpCisgICAgICAgICAgICBpZiAoIWRlY29kZVN0cmluZyh0b2tlblN0YXJ0ICsg MSwgdG9rZW5FbmQgLSAxLCAma2V5KSkKICAgICAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAg ICAgICAgIHN0YXJ0ID0gdG9rZW5FbmQ7CiAKLSAgICAgICAgICAgIHRva2VuID0gcGFyc2VUb2tl bihzdGFydCwgZW5kLCAmdG9rZW5FbmQpOworICAgICAgICAgICAgdG9rZW4gPSBwYXJzZVRva2Vu KHN0YXJ0LCBlbmQsICZ0b2tlblN0YXJ0LCAmdG9rZW5FbmQpOwogICAgICAgICAgICAgaWYgKHRv a2VuICE9IE9CSkVDVF9QQUlSX1NFUEFSQVRPUikKICAgICAgICAgICAgICAgICByZXR1cm4gMDsK ICAgICAgICAgICAgIHN0YXJ0ID0gdG9rZW5FbmQ7CkBAIC00MTMsMTAgKzQxOSwxMCBAQCBQYXNz UmVmUHRyPEluc3BlY3RvclZhbHVlPiBidWlsZFZhbHVlKGNvbnN0IFVDaGFyKiBzdGFydCwgY29u c3QgVUNoYXIqIGVuZCwgY29ucwogCiAgICAgICAgICAgICAvLyBBZnRlciBhIGtleS92YWx1ZSBw YWlyLCB3ZSBleHBlY3QgYSBjb21tYSBvciB0aGUgZW5kIG9mIHRoZQogICAgICAgICAgICAgLy8g b2JqZWN0LgotICAgICAgICAgICAgdG9rZW4gPSBwYXJzZVRva2VuKHN0YXJ0LCBlbmQsICZ0b2tl bkVuZCk7CisgICAgICAgICAgICB0b2tlbiA9IHBhcnNlVG9rZW4oc3RhcnQsIGVuZCwgJnRva2Vu U3RhcnQsICZ0b2tlbkVuZCk7CiAgICAgICAgICAgICBpZiAodG9rZW4gPT0gTElTVF9TRVBBUkFU T1IpIHsKICAgICAgICAgICAgICAgICBzdGFydCA9IHRva2VuRW5kOwotICAgICAgICAgICAgICAg IHRva2VuID0gcGFyc2VUb2tlbihzdGFydCwgZW5kLCAmdG9rZW5FbmQpOworICAgICAgICAgICAg ICAgIHRva2VuID0gcGFyc2VUb2tlbihzdGFydCwgZW5kLCAmdG9rZW5TdGFydCwgJnRva2VuRW5k KTsKICAgICAgICAgICAgICAgICAgaWYgKHRva2VuID09IE9CSkVDVF9FTkQpCiAgICAgICAgICAg ICAgICAgICAgIHJldHVybiAwOwogICAgICAgICAgICAgfSBlbHNlIGlmICh0b2tlbiAhPSBPQkpF Q1RfRU5EKSB7Cg==