149922 2015-10-08 04:18:44 -0700 Web Inspector: Stack trace view doesn't properly display lines without function names 2015-10-08 23:02:07 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1131598 0 nvasilyev 2015-10-08 04:18:44 -0700 Image: https://bugs.webkit.org/attachment.cgi?id=262414. Note how the last line of the stack trace didn't get parsed correctly. Expected: (anonymous function) - error-prefix.html:27 Actual: Full path, cannot be clicked. 1131599 1 webkit-bug-importer 2015-10-08 04:18:59 -0700 <rdar://problem/23028382> 1131600 2 262686 nvasilyev 2015-10-08 04:24:03 -0700 Created attachment 262686 [HTML] Reduction 1131601 3 262687 nvasilyev 2015-10-08 04:28:23 -0700 Created attachment 262687 Patch 1131621 4 262687 timothy 2015-10-08 07:55:23 -0700 Comment on attachment 262687 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262687&action=review > Source/WebInspectorUI/UserInterface/Models/StackTrace.js:65 > + ({url, lineNumber, columnNumber} = WebInspector.StackTrace._parseLocation(line.slice(atIndex + 1))); Is the wrapping () needed here? > Source/WebInspectorUI/UserInterface/Models/StackTrace.js:67 > + ({url, lineNumber, columnNumber} = WebInspector.StackTrace._parseLocation(line)); Ditto. 1131690 5 262687 joepeck 2015-10-08 11:23:36 -0700 Comment on attachment 262687 Patch It looks like this can be tested. Can we write a test for it? 1131831 6 nvasilyev 2015-10-08 22:08:47 -0700 (In reply to comment #4) > Comment on attachment 262687 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=262687&action=review > > > Source/WebInspectorUI/UserInterface/Models/StackTrace.js:65 > > + ({url, lineNumber, columnNumber} = WebInspector.StackTrace._parseLocation(line.slice(atIndex + 1))); > > Is the wrapping () needed here? > > > Source/WebInspectorUI/UserInterface/Models/StackTrace.js:67 > > + ({url, lineNumber, columnNumber} = WebInspector.StackTrace._parseLocation(line)); > > Ditto. Yes! I was surprised to discover this too. var x = 0; {x} = {x: 2}; // SyntaxError: Unexpected token '=' console.info(x); This, however, works as you'd expect: var {x} = {x: 2}; console.info(x); // 2 1131833 7 262747 nvasilyev 2015-10-08 22:10:57 -0700 Created attachment 262747 Patch (with a test) 1131846 8 262747 commit-queue 2015-10-08 23:02:02 -0700 Comment on attachment 262747 Patch (with a test) Clearing flags on attachment: 262747 Committed r190780: <http://trac.webkit.org/changeset/190780> 1131847 9 commit-queue 2015-10-08 23:02:07 -0700 All reviewed patches have been landed. Closing bug. 262686 2015-10-08 04:24:03 -0700 2015-10-08 04:24:03 -0700 [HTML] Reduction error-prefix.html text/html 601 nvasilyev PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KICAgIDxtZXRhIGNoYXJzZXQ9IlVURi04Ij4K ICAgIDx0aXRsZT5FcnJvciBVSTwvdGl0bGU+CjwvaGVhZD4KPGJvZHkgY2xhc3M9IiI+CjxidXR0 b24gb25jbGljaz0iYmFtKCkiPmJhbSgpPC9idXR0b24+CjxzY3JpcHQ+CmZ1bmN0aW9uIGxvbmdM b25nTG9uZ0xvbmdMb25nTG9uZ0xvbmdMb25nRnVuY3Rpb25OYW1lKCkgewogICAgaS5kb250LmV4 aXN0Kys7Cn0KCmZ1bmN0aW9uIGJhcigpIHsKICAgIGxvbmdMb25nTG9uZ0xvbmdMb25nTG9uZ0xv bmdMb25nRnVuY3Rpb25OYW1lKCk7Cn0KCmZ1bmN0aW9uIGJhbSgpIHsKICAgIHRyeSB7CiAgICAg ICAgYmFyKCk7CiAgICB9IGNhdGNoKGVycm9yKSB7CiAgICAgICAgY29uc29sZS5sb2coZXJyb3Ip OwogICAgICAgIGNvbnNvbGUubG9nKCJwcmVmaXgiLCBlcnJvcik7CiAgICAgICAgY29uc29sZS5s b2coInByZWZpeCIsIGVycm9yLCB3aW5kb3cpOwogICAgfQp9Cgpkb2N1bWVudC5hZGRFdmVudExp c3RlbmVyKCJET01Db250ZW50TG9hZGVkIiwgZnVuY3Rpb24oZSkgewogICAgYmFtKCk7Cn0sIGZh bHNlKTsKPC9zY3JpcHQ+CjwvYm9keT4KPC9odG1sPg== 262687 2015-10-08 04:28:23 -0700 2015-10-08 22:10:57 -0700 Patch patch.txt text/plain 3185 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDEzOTRmMTYuLmY3ODZmYmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTEwLTA4ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN0YWNr IHRyYWNlIHZpZXcgZG9lc24ndCBwcm9wZXJseSBzaG93IHRoZSBsaW5lcyB3aXRob3V0IGZ1bmN0 aW9uIG5hbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNDk5MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1N0YWNrVHJhY2UuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU3RhY2tUcmFjZS5fcGFyc2VTdGFja1RyYWNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TdGFja1RyYWNlLl9wYXJzZUxvY2F0aW9uKTogQWRkZWQuCisKIDIwMTUtMTAtMDYgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogQ2xpY2tpbmcgb24gYSBzdGFjayB0cmFjZSBsaW5rIGRvZXMgbm90IG5hdmlnYXRlIHRvIHRo ZSBjb3JyZXNwb25kaW5nIGxpbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9TdGFja1RyYWNlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL1N0YWNrVHJhY2UuanMKaW5kZXggZDRjNjQ1Yi4uNmQzYjE5 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxz L1N0YWNrVHJhY2UuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL1N0YWNrVHJhY2UuanMKQEAgLTU4LDI0ICs1OCwxNCBAQCBXZWJJbnNwZWN0b3IuU3Rh Y2tUcmFjZSA9IGNsYXNzIFN0YWNrVHJhY2UgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAg ICAgICAgICAgICB2YXIgdXJsID0gIiI7CiAgICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IDA7 CiAgICAgICAgICAgICB2YXIgY29sdW1uTnVtYmVyID0gMDsKLQotICAgICAgICAgICAgdmFyIGlu ZGV4ID0gbGluZS5pbmRleE9mKCJAIik7Ci0gICAgICAgICAgICBpZiAoaW5kZXggIT09IC0xKSB7 Ci0gICAgICAgICAgICAgICAgZnVuY3Rpb25OYW1lID0gbGluZS5zbGljZSgwLCBpbmRleCk7Ci0g ICAgICAgICAgICAgICAgdXJsID0gbGluZS5zbGljZShpbmRleCArIDEpOwotCi0gICAgICAgICAg ICAgICAgdmFyIGNvbHVtbkluZGV4ID0gdXJsLmxhc3RJbmRleE9mKCI6Iik7Ci0gICAgICAgICAg ICAgICAgaWYgKGNvbHVtbkluZGV4ICE9PSAtMSkgewotICAgICAgICAgICAgICAgICAgICBjb2x1 bW5OdW1iZXIgPSBwYXJzZUludCh1cmwuc2xpY2UoY29sdW1uSW5kZXggKyAxKSk7Ci0KLSAgICAg ICAgICAgICAgICAgICAgdXJsID0gdXJsLnNsaWNlKDAsIGNvbHVtbkluZGV4KTsKLSAgICAgICAg ICAgICAgICAgICAgdmFyIGxpbmVJbmRleCA9IHVybC5sYXN0SW5kZXhPZigiOiIsIGNvbHVtbklu ZGV4KTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGxpbmVJbmRleCAhPT0gLTEpIHsKLSAgICAg ICAgICAgICAgICAgICAgICAgIGxpbmVOdW1iZXIgPSBwYXJzZUludCh1cmwuc2xpY2UobGluZUlu ZGV4ICsgMSwgY29sdW1uSW5kZXgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIHVybCA9IHVy bC5zbGljZSgwLCBsaW5lSW5kZXgpOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICB2YXIgYXRJbmRleCA9IGxp bmUuaW5kZXhPZigiQCIpOworCisgICAgICAgICAgICBpZiAoYXRJbmRleCAhPT0gLTEpIHsKKyAg ICAgICAgICAgICAgICBmdW5jdGlvbk5hbWUgPSBsaW5lLnNsaWNlKDAsIGF0SW5kZXgpOworICAg ICAgICAgICAgICAgICh7dXJsLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXJ9ID0gV2ViSW5zcGVj dG9yLlN0YWNrVHJhY2UuX3BhcnNlTG9jYXRpb24obGluZS5zbGljZShhdEluZGV4ICsgMSkpKTsK KyAgICAgICAgICAgIH0gZWxzZSBpZiAobGluZS5pbmNsdWRlcygiLyIpKQorICAgICAgICAgICAg ICAgICh7dXJsLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXJ9ID0gV2ViSW5zcGVjdG9yLlN0YWNr VHJhY2UuX3BhcnNlTG9jYXRpb24obGluZSkpOworICAgICAgICAgICAgZWxzZQogICAgICAgICAg ICAgICAgIGZ1bmN0aW9uTmFtZSA9IGxpbmU7CiAKICAgICAgICAgICAgIHJlc3VsdC5wdXNoKHtm dW5jdGlvbk5hbWUsIHVybCwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyfSk7CkBAIC04NCw2ICs3 NCwyNiBAQCBXZWJJbnNwZWN0b3IuU3RhY2tUcmFjZSA9IGNsYXNzIFN0YWNrVHJhY2UgZXh0ZW5k cyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogCisg ICAgc3RhdGljIF9wYXJzZUxvY2F0aW9uKGxvY2F0aW9uU3RyaW5nKQorICAgIHsKKyAgICAgICAg dmFyIHJlc3VsdCA9IHt1cmw6ICIiLCBsaW5lTnVtYmVyOiAwLCBjb2x1bW5OdW1iZXI6IDB9Owor ICAgICAgICB2YXIgbG9jYXRpb25SZWdFeCA9IC8oLis/KSg/OjooXGQrKSg/OjooXGQrKSk/KT8k LzsKKyAgICAgICAgdmFyIG1hdGNoZWQgPSBsb2NhdGlvblN0cmluZy5tYXRjaChsb2NhdGlvblJl Z0V4KTsKKworICAgICAgICBpZiAoIW1hdGNoZWQpCisgICAgICAgICAgICByZXR1cm4gcmVzdWx0 OworCisgICAgICAgIHJlc3VsdC51cmwgPSBtYXRjaGVkWzFdOworCisgICAgICAgIGlmIChtYXRj aGVkWzJdKQorICAgICAgICAgICAgcmVzdWx0LmxpbmVOdW1iZXIgPSBwYXJzZUludChtYXRjaGVk WzJdKTsKKworICAgICAgICBpZiAobWF0Y2hlZFszXSkKKyAgICAgICAgICAgIHJlc3VsdC5jb2x1 bW5OdW1iZXIgPSBwYXJzZUludChtYXRjaGVkWzNdKTsKKworICAgICAgICByZXR1cm4gcmVzdWx0 OworICAgIH0KKwogICAgIC8vIFB1YmxpYwogCiAgICAgZ2V0IGNhbGxGcmFtZXMoKQo= 262747 2015-10-08 22:10:57 -0700 2015-10-08 23:02:02 -0700 Patch (with a test) patch.txt text/plain 6131 nvasilyev ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlZDg1NTY2Li42YmRmY2M5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMTAt MDggIE5pa2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogU3RhY2sgdHJhY2UgdmlldyBkb2Vzbid0IHByb3Blcmx5IGRpc3BsYXkgbGlu ZXMgd2l0aG91dCBmdW5jdGlvbiBuYW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5OTIyCisKKyAgICAgICAgVGVzdCBhbiBhbm9teW1vdXMgZnVu Y3Rpb24uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAg ICogaW5zcGVjdG9yL2RlYnVnZ2VyL2pzLXN0YWNrdHJhY2UtZXhwZWN0ZWQudHh0OiBBbHNvLCBy ZWJhc2VsaW5lIG9uZSBvbGQgdGVzdC4KKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvanMt c3RhY2t0cmFjZS5odG1sOgorCiAyMDE1LTEwLTA4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIEdUSysgZ2FyZGVuaW5nLiBN YXJrIHNldmVyYWwgaW5zcGVjdG9yIHRlc3RzIGFzIHNsb3cuCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvanMtc3RhY2t0cmFjZS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvanMtc3RhY2t0cmFjZS1leHBlY3RlZC50eHQKaW5k ZXggMGM5N2U5MC4uODU5NTU1MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL2pzLXN0YWNrdHJhY2UtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9qcy1zdGFja3RyYWNlLWV4cGVjdGVkLnR4dApAQCAtNzEsOCArNzEsMjQg QEAgRXJyb3Igb2JqZWN0OgogICAgIHsKICAgICAgICAgImZ1bmN0aW9uTmFtZSI6ICJ0ZXN0V2l0 aE5hdGl2ZUNhbGxJbkJldHdlZW4iLAogICAgICAgICAidXJsIjogIi9pbnNwZWN0b3IvZGVidWdn ZXIvanMtc3RhY2t0cmFjZS5odG1sIiwKLSAgICAgICAgImxpbmVOdW1iZXIiOiAiMjMiLAotICAg ICAgICAiY29sdW1uTnVtYmVyIjogIjIwIgorICAgICAgICAibGluZU51bWJlciI6IDIzLAorICAg ICAgICAiY29sdW1uTnVtYmVyIjogMjAKKyAgICB9CitdCisKK0Vycm9yIG9iamVjdDoKK1sKKyAg ICB7CisgICAgICAgICJmdW5jdGlvbk5hbWUiOiAiIiwKKyAgICAgICAgInVybCI6ICIvaW5zcGVj dG9yL2RlYnVnZ2VyL2pzLXN0YWNrdHJhY2UuaHRtbCIsCisgICAgICAgICJsaW5lTnVtYmVyIjog MzEsCisgICAgICAgICJjb2x1bW5OdW1iZXIiOiAzMworICAgIH0sCisgICAgeworICAgICAgICAi ZnVuY3Rpb25OYW1lIjogImdsb2JhbCBjb2RlIiwKKyAgICAgICAgInVybCI6ICIvaW5zcGVjdG9y L2RlYnVnZ2VyL2pzLXN0YWNrdHJhY2UuaHRtbCIsCisgICAgICAgICJsaW5lTnVtYmVyIjogMzUs CisgICAgICAgICJjb2x1bW5OdW1iZXIiOiAzCiAgICAgfQogXQogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvanMtc3RhY2t0cmFjZS5odG1sIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2pzLXN0YWNrdHJhY2UuaHRtbAppbmRleCAzNjljZjNjLi43 MWUyMmE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvanMtc3Rh Y2t0cmFjZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9qcy1zdGFj a3RyYWNlLmh0bWwKQEAgLTIzLDYgKzIzLDIxIEBAIGZ1bmN0aW9uIHRlc3RXaXRoTmF0aXZlQ2Fs bEluQmV0d2VlbigpCiAgICAgcmV0dXJuIFs0Ml0ubWFwKHR5cGVFcnJvcilbMF07CiB9CiAKK3Zh ciBfYW5vbnltb3VzRnVuY3Rpb25FcnJvciA9IG51bGw7CisKKyhmdW5jdGlvbigpIHsKKyAgICB2 YXIgb2JqZWN0ID0ge307CisgICAgdHJ5IHsKKyAgICAgICAgb2JqZWN0Lm1ldGhvZERvZXNudEV4 aXN0KCk7CisgICAgfSBjYXRjaCAoZSkgeworICAgICAgICBfYW5vbnltb3VzRnVuY3Rpb25FcnJv ciA9IGUuc3RhY2s7CisgICAgfQorfSkoKTsKKworZnVuY3Rpb24gZ2V0QW5vbnltb3VzRnVuY3Rp b25FcnJvcigpIHsKKyAgICByZXR1cm4gX2Fub255bW91c0Z1bmN0aW9uRXJyb3I7Cit9CisKIAog ZnVuY3Rpb24gdGVzdCgpCiB7CkBAIC03MSw2ICs4NiwxOSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAg ICAgICAgSW5zcGVjdG9yVGVzdC5jb21wbGV0ZVRlc3QoKTsKICAgICB9KTsKIAorICAgIEluc3Bl Y3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoImdldEFub255bW91c0Z1bmN0aW9uRXJyb3IoKSIsIGZ1 bmN0aW9uKGVycm9yLCByZXN1bHQpIHsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIlxuRXJy b3Igb2JqZWN0OiIpOworCisgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgIEluc3BlY3Rv clRlc3QubG9nKGVycm9yKTsKKworICAgICAgICB2YXIgc3RhY2tUcmFjZSA9IHN0cmlwUGF5bG9h ZEFmdGVyRXZhbChXZWJJbnNwZWN0b3IuU3RhY2tUcmFjZS5fcGFyc2VTdGFja1RyYWNlKHJlc3Vs dC52YWx1ZSkpOworICAgICAgICBzdGFja1RyYWNlID0gc3RyaXBGaWxlUGF0aHMoc3RhY2tUcmFj ZSk7CisKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coSlNPTi5zdHJpbmdpZnkoc3RhY2tUcmFj ZSwgbnVsbCwgNCkpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCgpOworICAg IH0pOworCiAgICAgZnVuY3Rpb24gc3RyaXBGaWxlUGF0aHMoc3RhY2tUcmFjZSkKICAgICB7CiAg ICAgICAgIGZvciAodmFyIGZyYW1lIG9mIHN0YWNrVHJhY2UpIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdl TG9nCmluZGV4IDEzOTRmMTYuLjY5NWI0ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDE1LTEwLTA4ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBw bGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN0YWNrIHRyYWNlIHZpZXcgZG9lc24n dCBwcm9wZXJseSBkaXNwbGF5IGxpbmVzIHdpdGhvdXQgZnVuY3Rpb24gbmFtZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTkyMgorCisgICAgICAg IFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv TW9kZWxzL1N0YWNrVHJhY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RhY2tUcmFjZS5f cGFyc2VTdGFja1RyYWNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGFja1RyYWNlLl9wYXJz ZUxvY2F0aW9uKTogQWRkZWQuCisKIDIwMTUtMTAtMDYgIE5pa2l0YSBWYXNpbHlldiAgPG52YXNp bHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ2xpY2tpbmcgb24gYSBz dGFjayB0cmFjZSBsaW5rIGRvZXMgbm90IG5hdmlnYXRlIHRvIHRoZSBjb3JyZXNwb25kaW5nIGxp bmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9TdGFja1RyYWNlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL1N0YWNrVHJhY2UuanMKaW5kZXggZDRjNjQ1Yi4uNmQzYjE5ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1N0YWNrVHJhY2UuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1N0YWNrVHJhY2Uu anMKQEAgLTU4LDI0ICs1OCwxNCBAQCBXZWJJbnNwZWN0b3IuU3RhY2tUcmFjZSA9IGNsYXNzIFN0 YWNrVHJhY2UgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgICAgICB2YXIgdXJs ID0gIiI7CiAgICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IDA7CiAgICAgICAgICAgICB2YXIg Y29sdW1uTnVtYmVyID0gMDsKLQotICAgICAgICAgICAgdmFyIGluZGV4ID0gbGluZS5pbmRleE9m KCJAIik7Ci0gICAgICAgICAgICBpZiAoaW5kZXggIT09IC0xKSB7Ci0gICAgICAgICAgICAgICAg ZnVuY3Rpb25OYW1lID0gbGluZS5zbGljZSgwLCBpbmRleCk7Ci0gICAgICAgICAgICAgICAgdXJs ID0gbGluZS5zbGljZShpbmRleCArIDEpOwotCi0gICAgICAgICAgICAgICAgdmFyIGNvbHVtbklu ZGV4ID0gdXJsLmxhc3RJbmRleE9mKCI6Iik7Ci0gICAgICAgICAgICAgICAgaWYgKGNvbHVtbklu ZGV4ICE9PSAtMSkgewotICAgICAgICAgICAgICAgICAgICBjb2x1bW5OdW1iZXIgPSBwYXJzZUlu dCh1cmwuc2xpY2UoY29sdW1uSW5kZXggKyAxKSk7Ci0KLSAgICAgICAgICAgICAgICAgICAgdXJs ID0gdXJsLnNsaWNlKDAsIGNvbHVtbkluZGV4KTsKLSAgICAgICAgICAgICAgICAgICAgdmFyIGxp bmVJbmRleCA9IHVybC5sYXN0SW5kZXhPZigiOiIsIGNvbHVtbkluZGV4KTsKLSAgICAgICAgICAg ICAgICAgICAgaWYgKGxpbmVJbmRleCAhPT0gLTEpIHsKLSAgICAgICAgICAgICAgICAgICAgICAg IGxpbmVOdW1iZXIgPSBwYXJzZUludCh1cmwuc2xpY2UobGluZUluZGV4ICsgMSwgY29sdW1uSW5k ZXgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIHVybCA9IHVybC5zbGljZSgwLCBsaW5lSW5k ZXgpOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAg ICAgfSBlbHNlCisgICAgICAgICAgICB2YXIgYXRJbmRleCA9IGxpbmUuaW5kZXhPZigiQCIpOwor CisgICAgICAgICAgICBpZiAoYXRJbmRleCAhPT0gLTEpIHsKKyAgICAgICAgICAgICAgICBmdW5j dGlvbk5hbWUgPSBsaW5lLnNsaWNlKDAsIGF0SW5kZXgpOworICAgICAgICAgICAgICAgICh7dXJs LCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXJ9ID0gV2ViSW5zcGVjdG9yLlN0YWNrVHJhY2UuX3Bh cnNlTG9jYXRpb24obGluZS5zbGljZShhdEluZGV4ICsgMSkpKTsKKyAgICAgICAgICAgIH0gZWxz ZSBpZiAobGluZS5pbmNsdWRlcygiLyIpKQorICAgICAgICAgICAgICAgICh7dXJsLCBsaW5lTnVt YmVyLCBjb2x1bW5OdW1iZXJ9ID0gV2ViSW5zcGVjdG9yLlN0YWNrVHJhY2UuX3BhcnNlTG9jYXRp b24obGluZSkpOworICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGZ1bmN0aW9uTmFt ZSA9IGxpbmU7CiAKICAgICAgICAgICAgIHJlc3VsdC5wdXNoKHtmdW5jdGlvbk5hbWUsIHVybCwg bGluZU51bWJlciwgY29sdW1uTnVtYmVyfSk7CkBAIC04NCw2ICs3NCwyNiBAQCBXZWJJbnNwZWN0 b3IuU3RhY2tUcmFjZSA9IGNsYXNzIFN0YWNrVHJhY2UgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2Jq ZWN0CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogCisgICAgc3RhdGljIF9wYXJzZUxv Y2F0aW9uKGxvY2F0aW9uU3RyaW5nKQorICAgIHsKKyAgICAgICAgdmFyIHJlc3VsdCA9IHt1cmw6 ICIiLCBsaW5lTnVtYmVyOiAwLCBjb2x1bW5OdW1iZXI6IDB9OworICAgICAgICB2YXIgbG9jYXRp b25SZWdFeCA9IC8oLis/KSg/OjooXGQrKSg/OjooXGQrKSk/KT8kLzsKKyAgICAgICAgdmFyIG1h dGNoZWQgPSBsb2NhdGlvblN0cmluZy5tYXRjaChsb2NhdGlvblJlZ0V4KTsKKworICAgICAgICBp ZiAoIW1hdGNoZWQpCisgICAgICAgICAgICByZXR1cm4gcmVzdWx0OworCisgICAgICAgIHJlc3Vs dC51cmwgPSBtYXRjaGVkWzFdOworCisgICAgICAgIGlmIChtYXRjaGVkWzJdKQorICAgICAgICAg ICAgcmVzdWx0LmxpbmVOdW1iZXIgPSBwYXJzZUludChtYXRjaGVkWzJdKTsKKworICAgICAgICBp ZiAobWF0Y2hlZFszXSkKKyAgICAgICAgICAgIHJlc3VsdC5jb2x1bW5OdW1iZXIgPSBwYXJzZUlu dChtYXRjaGVkWzNdKTsKKworICAgICAgICByZXR1cm4gcmVzdWx0OworICAgIH0KKwogICAgIC8v IFB1YmxpYwogCiAgICAgZ2V0IGNhbGxGcmFtZXMoKQo=