155337 2016-03-10 16:29:55 -0800 Web Inspector: generated initWithPayload: protocol object initializers should recursively decode array and object members 2016-03-11 08:57:09 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg commit-queue graouts joepeck keith_miller mark.lam mattbaker msaboff nvasilyev saam timothy webkit-bug-importer oldest_to_newest 1173433 0 bburg 2016-03-10 16:29:55 -0800 Oops. 1173435 1 webkit-bug-importer 2016-03-10 16:30:49 -0800 <rdar://problem/25098357> 1173463 2 273654 bburg 2016-03-10 16:54:54 -0800 Created attachment 273654 Proposed Fix Needs to land in tandem with internal changes. 1173466 3 commit-queue 2016-03-10 16:56:53 -0800 This patch modifies the inspector protocol generator. Please ensure that you have rebaselined any generator test results (i.e., by running `Tools/Scripts/run-inspector-generator-tests --reset-results`) 1173732 4 bburg 2016-03-11 08:57:09 -0800 Committed r198022: <http://trac.webkit.org/changeset/198022> 273654 2016-03-10 16:54:54 -0800 2016-03-10 16:57:35 -0800 Proposed Fix bug-155337-20160310165441.patch text/plain 8056 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3OTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk ZWNiOTA0NjhhYTFhYTUwODEwMDAyM2FmM2RlODk2OTE2MmQ1MzdiLi40MThiODUxYWM3MWYxMzA0 Y2ZhM2VhN2E1YmU1ZmUyZTk3ZWJlNTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMCBAQAogMjAxNi0wMy0xMCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBnZW5lcmF0ZWQgaW5pdFdpdGhQYXlsb2FkOiBwcm90b2Nv bCBvYmplY3QgaW5pdGlhbGl6ZXJzIHNob3VsZCByZWN1cnNpdmVseSBkZWNvZGUgYXJyYXkgYW5k IG9iamVjdCBtZW1iZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTUzMzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI1MDk4MzU3PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGNhc2VzIHdoZXJl IGFuIG9iamVjdCBtZW1iZXIgaXMgaXRzZWxmIGFuIG9iamVjdCBvciBhcnJheSwgd2Ugd2VyZQor ICAgICAgICBub3QgY2FsbGluZyBpbml0V2l0aFBheWxvYWQ6IG9uIHRoZSBvYmplY3QgbWVtYmVy IGl0c2VsZi4gU28sIHRoaXMgY2F1c2VkCisgICAgICAgIGEgcnVudGltZSBlcnJvciB3aGVuIGNv bnN0cnVjdGluZyB0aGUgb3V0ZXIgb2JqZWN0IGJlY2F1c2UgdGhlIGdlbmVyYXRlZAorICAgICAg ICBjb2RlIGNhc3RlZCB0aGUgTlNEaWN0aW9uYXJ5L05TQXJyYXkgaW50byB0aGUgbWVtYmVyJ3Mg cHJvdG9jb2wgb2JqZWN0IHR5cGUuCisKKyAgICAgICAgKiBpbnNwZWN0b3Ivc2NyaXB0cy9jb2Rl Z2VuL29iamNfZ2VuZXJhdG9yLnB5OgorICAgICAgICAoT2JqQ0dlbmVyYXRvci5wYXlsb2FkX3Rv X29iamNfZXhwcmVzc2lvbl9mb3JfbWVtYmVyKToKKyAgICAgICAgRG8gYSBzdHJhaWdodGZvcndh cmQgY2FsbCB0byBpbml0V2l0aFBheWxvYWQ6IGZvciBvYmplY3RzLiBGb3IgYXJyYXlzLAorICAg ICAgICBjYWxsIGEgdGVtcGxhdGVkIGhlbHBlciBmdW5jdGlvbiB3aGljaCBkb2VzIHRoZSBzYW1l IHRoaW5nLiBUaGUgaGVscGVyCisgICAgICAgIGlzIHVzZWQgdG8gbWFrZSB0aGlzIGFycmF5IGRl Y29kaW5nIGZpdCBpbnRvIGEgc2luZ2xlIGdlbmVyYXRlZCBleHByZXNzaW9uLgorCisgICAgICAg IFJlYmFzZWxpbmUgcmVsZXZhbnQgdGVzdCByZXN1bHRzLgorCisgICAgICAgICogaW5zcGVjdG9y L3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvc2hhZG93ZWQtb3B0aW9uYWwtdHlwZS1zZXR0ZXJzLmpz b24tcmVzdWx0OgorICAgICAgICAqIGluc3BlY3Rvci9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL3R5 cGUtZGVjbGFyYXRpb24tb2JqZWN0LXR5cGUuanNvbi1yZXN1bHQ6CisgICAgICAgICogaW5zcGVj dG9yL3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvdHlwZS1yZXF1aXJpbmctcnVudGltZS1jYXN0cy5q c29uLXJlc3VsdDoKKworMjAxNi0wMy0xMCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4K KwogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZXBvcnQgdGhlIHVuZGVybHlpbmcgcGFyc2VyIGVy cm9yIG1lc3NhZ2Ugd2hlbiBKU09OIHBhcnNpbmcgZmFpbHMKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTMwMwogICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMjUwODg5Mzk+CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L3NjcmlwdHMvY29kZWdlbi9vYmpjX2dlbmVyYXRvci5weSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL29iamNfZ2VuZXJhdG9yLnB5CmluZGV4IDI5ZmY0 YTA5ZTllNmEwODM4MmYzY2MxMjY5MTk5MGJkNjc5N2EyZjYuLmJlZTk4Y2NkYWQxZjE2Yjc1MTkx NTBiZmI2YTcwMWI3NGZlZjM0MzcgMTAwNzU1Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL29iamNfZ2VuZXJhdG9yLnB5CisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL29iamNfZ2VuZXJhdG9yLnB5 CkBAIC00NzksOCArNDc5LDEyIEBAIGNsYXNzIE9iakNHZW5lcmF0b3IoR2VuZXJhdG9yKToKICAg ICAgICAgICAgICAgICByZXR1cm4gJ2Zyb21Qcm90b2NvbFN0cmluZzwlcz4oJXMpJyAlIChzZWxm Lm9iamNfZW51bV9uYW1lX2Zvcl9hbm9ueW1vdXNfZW51bV9tZW1iZXIoZGVjbGFyYXRpb24sIG1l bWJlciksIHN1Yl9leHByZXNzaW9uKQogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAg ICByZXR1cm4gJ2Zyb21Qcm90b2NvbFN0cmluZzwlcz4oJXMpJyAlIChzZWxmLm9iamNfZW51bV9u YW1lX2Zvcl9ub25fYW5vbnltb3VzX2VudW0obWVtYmVyLnR5cGUpLCBzdWJfZXhwcmVzc2lvbikK LSAgICAgICAgaWYgaXNpbnN0YW5jZShfdHlwZSwgKE9iamVjdFR5cGUsIEFycmF5VHlwZSkpOgot ICAgICAgICAgICAgcmV0dXJuICdwYXlsb2FkW0AiJXMiXScgJSBtZW1iZXIubWVtYmVyX25hbWUK KyAgICAgICAgaWYgaXNpbnN0YW5jZShfdHlwZSwgT2JqZWN0VHlwZSk6CisgICAgICAgICAgICBv YmpjX2NsYXNzID0gc2VsZi5vYmpjX2NsYXNzX2Zvcl90eXBlKG1lbWJlci50eXBlKQorICAgICAg ICAgICAgcmV0dXJuICdbWyVzIGFsbG9jXSBpbml0V2l0aFBheWxvYWQ6cGF5bG9hZFtAIiVzIl1d JyAlIChvYmpjX2NsYXNzLCBtZW1iZXIubWVtYmVyX25hbWUpCisgICAgICAgIGlmIGlzaW5zdGFu Y2UoX3R5cGUsIEFycmF5VHlwZSk6CisgICAgICAgICAgICBvYmpjX2NsYXNzID0gc2VsZi5vYmpj X2NsYXNzX2Zvcl90eXBlKG1lbWJlci50eXBlLmVsZW1lbnRfdHlwZSkKKyAgICAgICAgICAgIHJl dHVybiAnb2JqY0FycmF5RnJvbVBheWxvYWQ8JXM+KHBheWxvYWRbQCIlcyJdKScgJSAob2JqY19j bGFzcywgbWVtYmVyLm1lbWJlcl9uYW1lKQogCiAgICAgIyBKU09OIG9iamVjdCBzZXR0ZXIvZ2V0 dGVyIHNlbGVjdG9ycyBmb3IgdHlwZXMuCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9zaGFkb3dlZC1vcHRpb25hbC10 eXBlLXNldHRlcnMuanNvbi1yZXN1bHQgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvc2hhZG93ZWQtb3B0aW9uYWwtdHlwZS1zZXR0ZXJzLmpz b24tcmVzdWx0CmluZGV4IDQxNjU1YjlkZmI2ZDkzZmEzM2RjNzhlMDg4NzZkMWQxNWVkZThkNTMu LjcxM2VkOTU2ZTc0NzViOTc5YmQxNTMwNmU3ZTJmNjdlYzhmYWYwYTIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9zaGFk b3dlZC1vcHRpb25hbC10eXBlLXNldHRlcnMuanNvbi1yZXN1bHQKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL3NoYWRvd2VkLW9wdGlv bmFsLXR5cGUtc2V0dGVycy5qc29uLXJlc3VsdApAQCAtMTAwOSw3ICsxMDA5LDcgQEAgdXNpbmcg bmFtZXNwYWNlIEluc3BlY3RvcjsKIAogICAgIHNlbGYuc3RyaW5nID0gcGF5bG9hZFtAInN0cmlu ZyJdOwogCi0gICAgc2VsZi5hcnJheSA9IHBheWxvYWRbQCJhcnJheSJdOworICAgIHNlbGYuYXJy YXkgPSBvYmpjQXJyYXlGcm9tUGF5bG9hZDxOU1N0cmluZz4ocGF5bG9hZFtAImFycmF5Il0pOwog CiAgICAgcmV0dXJuIHNlbGY7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvdHlwZS1kZWNsYXJhdGlvbi1vYmplY3Qt dHlwZS5qc29uLXJlc3VsdCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0 cy90ZXN0cy9leHBlY3RlZC90eXBlLWRlY2xhcmF0aW9uLW9iamVjdC10eXBlLmpzb24tcmVzdWx0 CmluZGV4IGU5ZTQ1ZGJkZjhmODM3YjU5MzZmNTRjN2FkZjgyY2NmYTZjMzFmMWMuLjdhYjYxNjE1 YjI1NjdkOTU1MWExM2Y4MzZjYzI5ZDhjMDRlNjljYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBlY3RlZC90eXBlLWRlY2xhcmF0 aW9uLW9iamVjdC10eXBlLmpzb24tcmVzdWx0CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBlY3RlZC90eXBlLWRlY2xhcmF0aW9uLW9iamVjdC10 eXBlLmpzb24tcmVzdWx0CkBAIC0xNTIyLDcgKzE1MjIsNyBAQCB1c2luZyBuYW1lc3BhY2UgSW5z cGVjdG9yOwogICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0pKQogICAgICAgICByZXR1cm4g bmlsOwogCi0gICAgc2VsZi5jb2x1bW5OYW1lcyA9IHBheWxvYWRbQCJjb2x1bW5OYW1lcyJdOwor ICAgIHNlbGYuY29sdW1uTmFtZXMgPSBvYmpjQXJyYXlGcm9tUGF5bG9hZDxOU1N0cmluZz4ocGF5 bG9hZFtAImNvbHVtbk5hbWVzIl0pOwogCiAgICAgc2VsZi5ub3RlcyA9IHBheWxvYWRbQCJub3Rl cyJdOwogCkBAIC0xNTMyLDkgKzE1MzIsOSBAQCB1c2luZyBuYW1lc3BhY2UgSW5zcGVjdG9yOwog CiAgICAgc2VsZi5wYXlsb2FkID0gcGF5bG9hZFtAInBheWxvYWQiXTsKIAotICAgIHNlbGYuZXJy b3IgPSBwYXlsb2FkW0AiZXJyb3IiXTsKKyAgICBzZWxmLmVycm9yID0gW1tUZXN0UHJvdG9jb2xE YXRhYmFzZUVycm9yIGFsbG9jXSBpbml0V2l0aFBheWxvYWQ6cGF5bG9hZFtAImVycm9yIl1dOwog Ci0gICAgc2VsZi5lcnJvckxpc3QgPSBwYXlsb2FkW0AiZXJyb3JMaXN0Il07CisgICAgc2VsZi5l cnJvckxpc3QgPSBvYmpjQXJyYXlGcm9tUGF5bG9hZDxUZXN0UHJvdG9jb2xEYXRhYmFzZUVycm9y PihwYXlsb2FkW0AiZXJyb3JMaXN0Il0pOwogCiAgICAgcmV0dXJuIHNlbGY7CiB9CkBAIC0xNjIw LDcgKzE2MjAsNyBAQCB1c2luZyBuYW1lc3BhY2UgSW5zcGVjdG9yOwogICAgICAgICByZXR1cm4g bmlsOwogCiAgICAgVEhST1dfRVhDRVBUSU9OX0ZPUl9SRVFVSVJFRF9QUk9QRVJUWShwYXlsb2Fk W0AiY29sdW1uTmFtZXMiXSwgQCJjb2x1bW5OYW1lcyIpOwotICAgIHNlbGYuY29sdW1uTmFtZXMg PSBwYXlsb2FkW0AiY29sdW1uTmFtZXMiXTsKKyAgICBzZWxmLmNvbHVtbk5hbWVzID0gb2JqY0Fy cmF5RnJvbVBheWxvYWQ8TlNTdHJpbmc+KHBheWxvYWRbQCJjb2x1bW5OYW1lcyJdKTsKIAogICAg IFRIUk9XX0VYQ0VQVElPTl9GT1JfUkVRVUlSRURfUFJPUEVSVFkocGF5bG9hZFtAIm5vdGVzIl0s IEAibm90ZXMiKTsKICAgICBzZWxmLm5vdGVzID0gcGF5bG9hZFtAIm5vdGVzIl07CkBAIC0xNjM1 LDEwICsxNjM1LDEwIEBAIHVzaW5nIG5hbWVzcGFjZSBJbnNwZWN0b3I7CiAgICAgc2VsZi5wYXls b2FkID0gcGF5bG9hZFtAInBheWxvYWQiXTsKIAogICAgIFRIUk9XX0VYQ0VQVElPTl9GT1JfUkVR VUlSRURfUFJPUEVSVFkocGF5bG9hZFtAImVycm9yIl0sIEAiZXJyb3IiKTsKLSAgICBzZWxmLmVy cm9yID0gcGF5bG9hZFtAImVycm9yIl07CisgICAgc2VsZi5lcnJvciA9IFtbVGVzdFByb3RvY29s RGF0YWJhc2VFcnJvciBhbGxvY10gaW5pdFdpdGhQYXlsb2FkOnBheWxvYWRbQCJlcnJvciJdXTsK IAogICAgIFRIUk9XX0VYQ0VQVElPTl9GT1JfUkVRVUlSRURfUFJPUEVSVFkocGF5bG9hZFtAImVy cm9yTGlzdCJdLCBAImVycm9yTGlzdCIpOwotICAgIHNlbGYuZXJyb3JMaXN0ID0gcGF5bG9hZFtA ImVycm9yTGlzdCJdOworICAgIHNlbGYuZXJyb3JMaXN0ID0gb2JqY0FycmF5RnJvbVBheWxvYWQ8 VGVzdFByb3RvY29sRGF0YWJhc2VFcnJvcj4ocGF5bG9hZFtAImVycm9yTGlzdCJdKTsKIAogICAg IHJldHVybiBzZWxmOwogfQpAQCAtMTg2MCw3ICsxODYwLDcgQEAgdXNpbmcgbmFtZXNwYWNlIElu c3BlY3RvcjsKICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAgIFRIUk9XX0VYQ0VQVElPTl9GT1Jf UkVRVUlSRURfUFJPUEVSVFkocGF5bG9hZFtAImNvbHVtbk5hbWVzIl0sIEAiY29sdW1uTmFtZXMi KTsKLSAgICBzZWxmLmNvbHVtbk5hbWVzID0gcGF5bG9hZFtAImNvbHVtbk5hbWVzIl07CisgICAg c2VsZi5jb2x1bW5OYW1lcyA9IG9iamNBcnJheUZyb21QYXlsb2FkPE5TU3RyaW5nPihwYXlsb2Fk W0AiY29sdW1uTmFtZXMiXSk7CiAKICAgICBUSFJPV19FWENFUFRJT05fRk9SX1JFUVVJUkVEX1BS T1BFUlRZKHBheWxvYWRbQCJub3RlcyJdLCBAIm5vdGVzIik7CiAgICAgc2VsZi5ub3RlcyA9IHBh eWxvYWRbQCJub3RlcyJdOwpAQCAtMTg3NSw3ICsxODc1LDcgQEAgdXNpbmcgbmFtZXNwYWNlIElu c3BlY3RvcjsKICAgICBzZWxmLnBheWxvYWQgPSBwYXlsb2FkW0AicGF5bG9hZCJdOwogCiAgICAg VEhST1dfRVhDRVBUSU9OX0ZPUl9SRVFVSVJFRF9QUk9QRVJUWShwYXlsb2FkW0AiZXJyb3IiXSwg QCJlcnJvciIpOwotICAgIHNlbGYuZXJyb3IgPSBwYXlsb2FkW0AiZXJyb3IiXTsKKyAgICBzZWxm LmVycm9yID0gW1tUZXN0UHJvdG9jb2xEYXRhYmFzZUVycm9yIGFsbG9jXSBpbml0V2l0aFBheWxv YWQ6cGF5bG9hZFtAImVycm9yIl1dOwogCiAgICAgcmV0dXJuIHNlbGY7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQv dHlwZS1yZXF1aXJpbmctcnVudGltZS1jYXN0cy5qc29uLXJlc3VsdCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBlY3RlZC90eXBlLXJlcXVpcmluZy1y dW50aW1lLWNhc3RzLmpzb24tcmVzdWx0CmluZGV4IDVmZDRiODUxZThhZGEwZDAwZDE0Njk1OTFj NmI2OTA5ODJkZjRiZGMuLmJlZDE0ODJiZmY4ZTQ3Y2YyZTA1NjY4NmM2OWYwZTQzYTgxNTY0Nzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90ZXN0 cy9leHBlY3RlZC90eXBlLXJlcXVpcmluZy1ydW50aW1lLWNhc3RzLmpzb24tcmVzdWx0CisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBlY3RlZC90 eXBlLXJlcXVpcmluZy1ydW50aW1lLWNhc3RzLmpzb24tcmVzdWx0CkBAIC0xMzk0LDcgKzEzOTQs NyBAQCB1c2luZyBuYW1lc3BhY2UgSW5zcGVjdG9yOwogICAgIHNlbGYuaWRlbnRpZmllciA9IFtw YXlsb2FkW0AiaWQiXSBpbnRlZ2VyVmFsdWVdOwogCiAgICAgVEhST1dfRVhDRVBUSU9OX0ZPUl9S RVFVSVJFRF9QUk9QRVJUWShwYXlsb2FkW0AidHJlZSJdLCBAInRyZWUiKTsKLSAgICBzZWxmLnRy ZWUgPSBwYXlsb2FkW0AidHJlZSJdOworICAgIHNlbGYudHJlZSA9IFtbVGVzdFByb3RvY29sVGVz dFJlY3Vyc2l2ZU9iamVjdDEgYWxsb2NdIGluaXRXaXRoUGF5bG9hZDpwYXlsb2FkW0AidHJlZSJd XTsKIAogICAgIHJldHVybiBzZWxmOwogfQpAQCAtMTQ3Niw3ICsxNDc2LDcgQEAgdXNpbmcgbmFt ZXNwYWNlIEluc3BlY3RvcjsKICAgICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKICAgICAg ICAgcmV0dXJuIG5pbDsKIAotICAgIHNlbGYub2JqID0gcGF5bG9hZFtAIm9iaiJdOworICAgIHNl bGYub2JqID0gW1tUZXN0UHJvdG9jb2xUZXN0UmVjdXJzaXZlT2JqZWN0MiBhbGxvY10gaW5pdFdp dGhQYXlsb2FkOnBheWxvYWRbQCJvYmoiXV07CiAKICAgICByZXR1cm4gc2VsZjsKIH0KQEAgLTE1 MDAsNyArMTUwMCw3IEBAIHVzaW5nIG5hbWVzcGFjZSBJbnNwZWN0b3I7CiAgICAgaWYgKCEoc2Vs ZiA9IFtzdXBlciBpbml0XSkpCiAgICAgICAgIHJldHVybiBuaWw7CiAKLSAgICBzZWxmLm9iaiA9 IHBheWxvYWRbQCJvYmoiXTsKKyAgICBzZWxmLm9iaiA9IFtbVGVzdFByb3RvY29sVGVzdFJlY3Vy c2l2ZU9iamVjdDEgYWxsb2NdIGluaXRXaXRoUGF5bG9hZDpwYXlsb2FkW0Aib2JqIl1dOwogCiAg ICAgcmV0dXJuIHNlbGY7CiB9Cg==