17234 2008-02-08 13:56:26 -0800 Inspector should link console.{log,warn,info,error} back to call site 2008-09-02 15:00:36 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Enhancement --- 14354 1 aroben timothy keishi oldest_to_newest 69806 0 aroben 2008-02-08 13:56:26 -0800 The Inspector should link the output from console.{log,warn,info,error} back to the call site. 69835 1 aroben 2008-02-08 14:18:28 -0800 <rdar://problem/5732837> 75982 2 aroben 2008-03-31 14:02:34 -0700 In general we have no way of knowing what line number the console.* method was called on. 75986 3 aroben 2008-03-31 14:06:37 -0700 (In reply to comment #2) > In general we have no way of knowing what line number the console.* method was > called on. ...nor do we know what the URL of the script that made the call was. 86807 4 ggaren 2008-07-23 20:36:31 -0700 One way to solve this problem would be for console.log to use a special CallType that gets additional information passed to it when it's called as a function. Basically, this would require: * Add a new CallType to the CallType enum in JavaScriptCore * Make console.log's getCallData function return that CallType * Change the sites in JavaScriptCore that deal with CallType to handle this new CallType (I think there are about 4) 88214 5 keishi 2008-08-11 07:14:11 -0700 *** Bug 19791 has been marked as a duplicate of this bug. *** 88221 6 keishi 2008-08-11 08:34:53 -0700 (In reply to comment #4 at bug #19791) > I think using CustomCall for the Console object is fine. The majority of the > console functions want this info. > I tried doing "interface [CustomCall] Console {" but that doesn't seem to change the CallTypes for console.*. Calling console() seems to have the new custom CallType but that's not what I want. 88739 7 kmccullough 2008-08-18 11:06:26 -0700 I talked with Geoff about how to get the line numbers and source files for more than just these functions. I think we are going to be taking this in another direction. Once that lands, these should be simple to implement. 89913 8 23116 timothy 2008-09-02 10:09:58 -0700 Created attachment 23116 Proposed patch 89940 9 timothy 2008-09-02 15:00:36 -0700 Landed in r36029. 23116 2008-09-02 10:09:58 -0700 2008-09-02 10:47:31 -0700 Proposed patch 0001--Make-console-functions-log-the-correct-resou.patch text/plain 16245 timothy RnJvbSBjNTg4YWMzNGIwNWZhZDAwN2Y0NTM5YzM1ZDQ3NThjMmI0NzU4Y2NhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBUdWUsIDIgU2VwIDIwMDggMTA6MDg6NDIgLTA3MDAKU3ViamVjdDogW1BBVENIXSAgICAg ICAgIE1ha2UgY29uc29sZSBmdW5jdGlvbnMgbG9nIHRoZSBjb3JyZWN0IHJlc291cmNlIFVSTCBh bmQKICAgICAgICAgbGluZSBudW1iZXIgZm9yIHdoZXJlIHRoZSBjYWxsIG9yaWdpbmF0ZWQuCgog ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzIzNAogICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81NzMyODM3PgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KCiAgICAgICAgVGVzdDogbWFudWFsLXRlc3RzL2luc3BlY3Rvci9jb25zb2xlLWNh bGwtbGluZS1udW1iZXJzLmh0bWwKCiAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0NvbnNvbGVDdXN0 b20uY3BwOgogICAgICAgIChXZWJDb3JlOjpKU0NvbnNvbGU6OmNvdW50KTogQ2FsbCB0aGUgaW1w bC4KICAgICAgICAoV2ViQ29yZTo6SlNDb25zb2xlOjp0aW1lRW5kKTogRGl0dG8uCiAgICAgICAg KiBtYW51YWwtdGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUtY2FsbC1saW5lLW51bWJlcnMuaHRtbDog QWRkZWQuCiAgICAgICAgKiBtYW51YWwtdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9zY3JpcHQt Y29uc29sZS1jYWxscy5qczogQWRkZWQuCiAgICAgICAgKiBwYWdlL0NvbnNvbGUuY3BwOgogICAg ICAgIChXZWJDb3JlOjpyZXRyaWV2ZUxhc3RDYWxsZXIpOiBIZWxwZXIgdG8gZ2V0IHRoZSBVUkwg YW5kIGxpbmUuCiAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6OmVycm9yKTogQ2FsbCByZXRyaWV2 ZUxhc3RDYWxsZXIgdG8gZ2V0IHRoZSBVUkwgYW5kCiAgICAgICAgbGluZSBudW1iZXIgdG8gcGFz cyB0byBhZGRNZXNzYWdlVG9Db25zb2xlLgogICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjppbmZv KTogRGl0dG8uCiAgICAgICAgKFdlYkNvcmU6OkNvbnNvbGU6OmxvZyk6IERpdHRvLgogICAgICAg IChXZWJDb3JlOjpDb25zb2xlOjphc3NlcnRDb25kaXRpb24pOiBEaXR0by4KICAgICAgICAoV2Vi Q29yZTo6Q29uc29sZTo6Y291bnQpOiBEaXR0by4KICAgICAgICAoV2ViQ29yZTo6Q29uc29sZTo6 dGltZUVuZCk6IERpdHRvLgogICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjp3YXJuKTogRGl0dG8u CiAgICAgICAgKiBwYWdlL0NvbnNvbGUuaDoKICAgICAgICAqIHBhZ2UvQ29uc29sZS5pZGw6IE1h a2UgY291bnQgYW5kIHRpbWVFbmQgY3VzdG9tLgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAzMCArKysrKysrCiBXZWJDb3JlL2JpbmRp bmdzL2pzL0pTQ29uc29sZUN1c3RvbS5jcHAgICAgICAgICAgICB8ICAgMTIgKysrCiAuLi4vaW5z cGVjdG9yL2NvbnNvbGUtY2FsbC1saW5lLW51bWJlcnMuaHRtbCAgICAgICB8ICAgMTQgKysrCiAu Li4vaW5zcGVjdG9yL3Jlc291cmNlcy9zY3JpcHQtY29uc29sZS1jYWxscy5qcyAgICB8ICAgIDgg KysKIFdlYkNvcmUvcGFnZS9Db25zb2xlLmNwcCAgICAgICAgICAgICAgICAgICAgICAgICAgIHwg ICA4OCArKysrKysrKysrKysrKy0tLS0tLQogV2ViQ29yZS9wYWdlL0NvbnNvbGUuaCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfCAgIDI0ICsrKy0tLQogV2ViQ29yZS9wYWdlL0NvbnNvbGUu aWRsICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA0ICstCiA3IGZpbGVzIGNoYW5nZWQs IDE0MCBpbnNlcnRpb25zKCspLCA0MCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBX ZWJDb3JlL21hbnVhbC10ZXN0cy9pbnNwZWN0b3IvY29uc29sZS1jYWxsLWxpbmUtbnVtYmVycy5o dG1sCiBjcmVhdGUgbW9kZSAxMDA2NDQgV2ViQ29yZS9tYW51YWwtdGVzdHMvaW5zcGVjdG9yL3Jl c291cmNlcy9zY3JpcHQtY29uc29sZS1jYWxscy5qcwoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hh bmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQ1ZWUzNC4uYzQ2ODkyNyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSAr MSwzNSBAQAogMjAwOC0wOS0wMiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+ CiAKKyAgICAgICAgTWFrZSBjb25zb2xlIGZ1bmN0aW9ucyBsb2cgdGhlIGNvcnJlY3QgcmVzb3Vy Y2UgVVJMIGFuZAorICAgICAgICBsaW5lIG51bWJlciBmb3Igd2hlcmUgdGhlIGNhbGwgb3JpZ2lu YXRlZC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTcyMzQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU3MzI4Mzc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogbWFudWFsLXRlc3RzL2luc3Bl Y3Rvci9jb25zb2xlLWNhbGwtbGluZS1udW1iZXJzLmh0bWwKKworICAgICAgICAqIGJpbmRpbmdz L2pzL0pTQ29uc29sZUN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0NvbnNvbGU6OmNv dW50KTogQ2FsbCB0aGUgaW1wbC4KKyAgICAgICAgKFdlYkNvcmU6OkpTQ29uc29sZTo6dGltZUVu ZCk6IERpdHRvLgorICAgICAgICAqIG1hbnVhbC10ZXN0cy9pbnNwZWN0b3IvY29uc29sZS1jYWxs LWxpbmUtbnVtYmVycy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBtYW51YWwtdGVzdHMvaW5zcGVj dG9yL3Jlc291cmNlcy9zY3JpcHQtY29uc29sZS1jYWxscy5qczogQWRkZWQuCisgICAgICAgICog cGFnZS9Db25zb2xlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnJldHJpZXZlTGFzdENhbGxlcik6 IEhlbHBlciB0byBnZXQgdGhlIFVSTCBhbmQgbGluZS4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnNv bGU6OmVycm9yKTogQ2FsbCByZXRyaWV2ZUxhc3RDYWxsZXIgdG8gZ2V0IHRoZSBVUkwgYW5kCisg ICAgICAgIGxpbmUgbnVtYmVyIHRvIHBhc3MgdG8gYWRkTWVzc2FnZVRvQ29uc29sZS4KKyAgICAg ICAgKFdlYkNvcmU6OkNvbnNvbGU6OmluZm8pOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkNv bnNvbGU6OmxvZyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZTo6YXNzZXJ0Q29u ZGl0aW9uKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpDb25zb2xlOjpjb3VudCk6IERpdHRv LgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZTo6dGltZUVuZCk6IERpdHRvLgorICAgICAgICAo V2ViQ29yZTo6Q29uc29sZTo6d2Fybik6IERpdHRvLgorICAgICAgICAqIHBhZ2UvQ29uc29sZS5o OgorICAgICAgICAqIHBhZ2UvQ29uc29sZS5pZGw6IE1ha2UgY291bnQgYW5kIHRpbWVFbmQgY3Vz dG9tLgorCisyMDA4LTA5LTAyICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4K KwogICAgICAgICBSZW1vdmVkIElETCBmaWxlcyBmcm9tIFdlYkNvcmUncyBmcmFtZXdvcmsgcmVz b3VyY2VzLgogCiAgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NvbnNvbGVDdXN0b20uY3BwIGIvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU0NvbnNvbGVDdXN0b20uY3BwCmluZGV4IGVhODVlZGMuLjI3YjMx ZGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDb25zb2xlQ3VzdG9tLmNwcAor KysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ29uc29sZUN1c3RvbS5jcHAKQEAgLTc3LDYgKzc3 LDE4IEBAIEpTVmFsdWUqIEpTQ29uc29sZTo6YXNzZXJ0Q29uZGl0aW9uKEV4ZWNTdGF0ZSogZXhl YywgY29uc3QgQXJnTGlzdCYgYXJndW1lbnRzKQogICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwog fQogCitKU1ZhbHVlKiBKU0NvbnNvbGU6OmNvdW50KEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJn TGlzdCYgYXJndW1lbnRzKQoreworICAgIGltcGwoKS0+Y291bnQoZXhlYywgYXJndW1lbnRzKTsK KyAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKK30KKworSlNWYWx1ZSogSlNDb25zb2xlOjp0aW1l RW5kKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJnTGlzdCYgYXJndW1lbnRzKQoreworICAgIGlt cGwoKS0+dGltZUVuZChleGVjLCBhcmd1bWVudHMpOworICAgIHJldHVybiBqc1VuZGVmaW5lZCgp OworfQorCiBKU1ZhbHVlKiBKU0NvbnNvbGU6OnByb2ZpbGUoRXhlY1N0YXRlKiBleGVjLCBjb25z dCBBcmdMaXN0JiBhcmd1bWVudHMpCiB7CiAgICAgaW1wbCgpLT5wcm9maWxlKGV4ZWMsIGFyZ3Vt ZW50cyk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL21hbnVhbC10ZXN0cy9pbnNwZWN0b3IvY29uc29s ZS1jYWxsLWxpbmUtbnVtYmVycy5odG1sIGIvV2ViQ29yZS9tYW51YWwtdGVzdHMvaW5zcGVjdG9y L2NvbnNvbGUtY2FsbC1saW5lLW51bWJlcnMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwLi5hZTgzMWM1Ci0tLSAvZGV2L251bGwKKysrIGIvV2ViQ29yZS9tYW51YWwtdGVz dHMvaW5zcGVjdG9yL2NvbnNvbGUtY2FsbC1saW5lLW51bWJlcnMuaHRtbApAQCAtMCwwICsxLDE0 IEBACis8c2NyaXB0PgorICAgIGNvbnNvbGUuaW5mbygiVGVzdCBjb25zb2xlLmluZm8iKTsKKyAg ICBjb25zb2xlLmxvZygiVGVzdCBjb25zb2xlLmxvZyIpOworICAgIGNvbnNvbGUud2FybigiVGVz dCBjb25zb2xlLndhcm4iKTsKKyAgICBjb25zb2xlLmVycm9yKCJUZXN0IGNvbnNvbGUuZXJyb3Ii KTsKKyAgICBjb25zb2xlLnRpbWUoIlRlc3QgY29uc29sZS50aW1lIik7CisgICAgY29uc29sZS50 aW1lRW5kKCJUZXN0IGNvbnNvbGUudGltZSIpOworICAgIGNvbnNvbGUuY291bnQoIlRlc3QgY29u c29sZS5jb3VudCIpOworICAgIGNvbnNvbGUuYXNzZXJ0KGZhbHNlLCAiVGVzdCBjb25zb2xlLmFz c2VydCIpOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL3NjcmlwdC1jb25zb2xl LWNhbGxzLmpzIj48L3NjcmlwdD4KKzxib2R5PgorPHA+VGVzdCBmb3IgPGEgaHJlZj0iaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjM0Ij5CdWcgMTcyMzQ6IEluc3Bl Y3RvciBzaG91bGQgbGluayBjb25zb2xlLntsb2csd2FybixpbmZvLGVycm9yfSBiYWNrIHRvIGNh bGwgc2l0ZTwvYT4uPC9wPgorPHA+VG8gdGVzdCwgb3BlbiB0aGUgSW5zcGVjdG9yJ3MgQ29uc29s ZSBhbmQgdmVyaWZ5IHRoYXQgYWxsIGNvbnNvbGUgbWVzc2FnZXMgaGF2ZSBjb3JyZWN0IHJlc291 cmNlIFVSTHMgYW5kIGxpbmUgbnVtYmVycy4gQWxzbyB2ZXJpZnkgdGhhdCBlcnJvcnMgYW5kIHdh cm5pbmdzIHNob3cgdXAgaW5saW5lIGFzIGJ1YmJsZXMgaW4gdGhlIHJlc291cmNlIHNvdXJjZSB2 aWV3LjwvcD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbWFudWFsLXRlc3RzL2luc3BlY3Rvci9yZXNv dXJjZXMvc2NyaXB0LWNvbnNvbGUtY2FsbHMuanMgYi9XZWJDb3JlL21hbnVhbC10ZXN0cy9pbnNw ZWN0b3IvcmVzb3VyY2VzL3NjcmlwdC1jb25zb2xlLWNhbGxzLmpzCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAuLjljN2JjMzUKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJDb3JlL21h bnVhbC10ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL3NjcmlwdC1jb25zb2xlLWNhbGxzLmpzCkBA IC0wLDAgKzEsOCBAQAorY29uc29sZS5pbmZvKCJUZXN0IGNvbnNvbGUuaW5mbyIpOworY29uc29s ZS5sb2coIlRlc3QgY29uc29sZS5sb2ciKTsKK2NvbnNvbGUud2FybigiVGVzdCBjb25zb2xlLndh cm4iKTsKK2NvbnNvbGUuZXJyb3IoIlRlc3QgY29uc29sZS5lcnJvciIpOworY29uc29sZS50aW1l KCJUZXN0IGNvbnNvbGUudGltZSIpOworY29uc29sZS50aW1lRW5kKCJUZXN0IGNvbnNvbGUudGlt ZSIpOworY29uc29sZS5jb3VudCgiVGVzdCBjb25zb2xlLmNvdW50Iik7Citjb25zb2xlLmFzc2Vy dChmYWxzZSwgIlRlc3QgY29uc29sZS5hc3NlcnQiKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFn ZS9Db25zb2xlLmNwcCBiL1dlYkNvcmUvcGFnZS9Db25zb2xlLmNwcAppbmRleCBhNjFjMzQ4Li41 ODZiZGQ2IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAKKysrIGIvV2ViQ29y ZS9wYWdlL0NvbnNvbGUuY3BwCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAiRnJhbWVMb2Fk ZXIuaCIKICNpbmNsdWRlICJGcmFtZVRyZWUuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JDb250cm9s bGVyLmgiCisjaW5jbHVkZSAiSlNET01CaW5kaW5nLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2lu Y2x1ZGUgIlBhZ2VHcm91cC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCkBAIC0xNDQs NiArMTQ1LDE4IEBAIHN0YXRpYyB2b2lkIHByaW50VG9TdGFuZGFyZE91dChNZXNzYWdlTGV2ZWwg bGV2ZWwsIEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJnTGlzCiAgICAgcHJpbnRmKCJcbiIpOwog fQogCitzdGF0aWMgaW5saW5lIHZvaWQgcmV0cmlldmVMYXN0Q2FsbGVyKEV4ZWNTdGF0ZSogZXhl YywgS1VSTCYgdXJsLCB1bnNpZ25lZCYgbGluZU51bWJlcikKK3sKKyAgICBpbnQgc2lnbmVkTGlu ZU51bWJlcjsKKyAgICBpbnQgc291cmNlSWRlbnRpZmVyOworICAgIFVTdHJpbmcgdXJsU3RyaW5n OworCisgICAgZXhlYy0+bWFjaGluZSgpLT5yZXRyaWV2ZUxhc3RDYWxsZXIoZXhlYywgc2lnbmVk TGluZU51bWJlciwgc291cmNlSWRlbnRpZmVyLCB1cmxTdHJpbmcpOworCisgICAgdXJsID0gS1VS TCh1cmxTdHJpbmcpOworICAgIGxpbmVOdW1iZXIgPSAoc2lnbmVkTGluZU51bWJlciA+PSAwID8g c2lnbmVkTGluZU51bWJlciA6IDApOworfQorCiB2b2lkIENvbnNvbGU6OmFkZE1lc3NhZ2UoTWVz c2FnZVNvdXJjZSBzb3VyY2UsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgY29uc3QgU3RyaW5nJiBtZXNz YWdlLCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCkKIHsKICAg ICBQYWdlKiBwYWdlID0gdGhpcy0+cGFnZSgpOwpAQCAtMTc3LDExICsxOTAsMTMgQEAgdm9pZCBD b25zb2xlOjplcnJvcihFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEFyZ0xpc3QmIGFyZ3MpCiAgICAg ICAgIHJldHVybjsKIAogICAgIFN0cmluZyBtZXNzYWdlID0gYXJncy5hdChleGVjLCAwKS0+dG9T dHJpbmcoZXhlYyk7Ci0gICAgY29uc3QgS1VSTCYgdXJsID0gbV9mcmFtZS0+bG9hZGVyKCktPnVy bCgpOwotICAgIFN0cmluZyBwcmV0dHlVUkwgPSB1cmwucHJldHR5VVJMKCk7CiAKLSAgICBwYWdl LT5jaHJvbWUoKS0+Y2xpZW50KCktPmFkZE1lc3NhZ2VUb0NvbnNvbGUobWVzc2FnZSwgMCwgcHJl dHR5VVJMKTsKLSAgICBwYWdlLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmFkZE1lc3NhZ2VUb0Nv bnNvbGUoSlNNZXNzYWdlU291cmNlLCBFcnJvck1lc3NhZ2VMZXZlbCwgZXhlYywgYXJncywgMCwg dXJsLnN0cmluZygpKTsKKyAgICBLVVJMIHVybDsKKyAgICB1bnNpZ25lZCBsaW5lTnVtYmVyOwor ICAgIHJldHJpZXZlTGFzdENhbGxlcihleGVjLCB1cmwsIGxpbmVOdW1iZXIpOworCisgICAgcGFn ZS0+Y2hyb21lKCktPmNsaWVudCgpLT5hZGRNZXNzYWdlVG9Db25zb2xlKG1lc3NhZ2UsIGxpbmVO dW1iZXIsIHVybC5wcmV0dHlVUkwoKSk7CisgICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigp LT5hZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2FnZVNvdXJjZSwgRXJyb3JNZXNzYWdlTGV2ZWws IGV4ZWMsIGFyZ3MsIGxpbmVOdW1iZXIsIHVybC5zdHJpbmcoKSk7CiAKICAgICBwcmludFRvU3Rh bmRhcmRPdXQoRXJyb3JNZXNzYWdlTGV2ZWwsIGV4ZWMsIGFyZ3MsIHVybCk7CiB9CkBAIC0xOTks MTEgKzIxNCwxMyBAQCB2b2lkIENvbnNvbGU6OmluZm8oRXhlY1N0YXRlKiBleGVjLCBjb25zdCBB cmdMaXN0JiBhcmdzKQogICAgICAgICByZXR1cm47CiAKICAgICBTdHJpbmcgbWVzc2FnZSA9IGFy Z3MuYXQoZXhlYywgMCktPnRvU3RyaW5nKGV4ZWMpOwotICAgIGNvbnN0IEtVUkwmIHVybCA9IG1f ZnJhbWUtPmxvYWRlcigpLT51cmwoKTsKLSAgICBTdHJpbmcgcHJldHR5VVJMID0gdXJsLnByZXR0 eVVSTCgpOwogCi0gICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5hZGRNZXNzYWdlVG9Db25z b2xlKG1lc3NhZ2UsIDAsIHByZXR0eVVSTCk7Ci0gICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxl cigpLT5hZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZUxldmVs LCBleGVjLCBhcmdzLCAwLCB1cmwuc3RyaW5nKCkpOworICAgIEtVUkwgdXJsOworICAgIHVuc2ln bmVkIGxpbmVOdW1iZXI7CisgICAgcmV0cmlldmVMYXN0Q2FsbGVyKGV4ZWMsIHVybCwgbGluZU51 bWJlcik7CisKKyAgICBwYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPmFkZE1lc3NhZ2VUb0NvbnNv bGUobWVzc2FnZSwgbGluZU51bWJlciwgdXJsLnByZXR0eVVSTCgpKTsKKyAgICBwYWdlLT5pbnNw ZWN0b3JDb250cm9sbGVyKCktPmFkZE1lc3NhZ2VUb0NvbnNvbGUoSlNNZXNzYWdlU291cmNlLCBM b2dNZXNzYWdlTGV2ZWwsIGV4ZWMsIGFyZ3MsIGxpbmVOdW1iZXIsIHVybC5zdHJpbmcoKSk7CiAK ICAgICBwcmludFRvU3RhbmRhcmRPdXQoTG9nTWVzc2FnZUxldmVsLCBleGVjLCBhcmdzLCB1cmwp OwogfQpAQCAtMjIxLDExICsyMzgsMTMgQEAgdm9pZCBDb25zb2xlOjpsb2coRXhlY1N0YXRlKiBl eGVjLCBjb25zdCBBcmdMaXN0JiBhcmdzKQogICAgICAgICByZXR1cm47CiAKICAgICBTdHJpbmcg bWVzc2FnZSA9IGFyZ3MuYXQoZXhlYywgMCktPnRvU3RyaW5nKGV4ZWMpOwotICAgIGNvbnN0IEtV UkwmIHVybCA9IG1fZnJhbWUtPmxvYWRlcigpLT51cmwoKTsKLSAgICBTdHJpbmcgcHJldHR5VVJM ID0gdXJsLnByZXR0eVVSTCgpOwogCi0gICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5hZGRN ZXNzYWdlVG9Db25zb2xlKG1lc3NhZ2UsIDAsIHByZXR0eVVSTCk7Ci0gICAgcGFnZS0+aW5zcGVj dG9yQ29udHJvbGxlcigpLT5hZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2FnZVNvdXJjZSwgTG9n TWVzc2FnZUxldmVsLCBleGVjLCBhcmdzLCAwLCB1cmwuc3RyaW5nKCkpOworICAgIEtVUkwgdXJs OworICAgIHVuc2lnbmVkIGxpbmVOdW1iZXI7CisgICAgcmV0cmlldmVMYXN0Q2FsbGVyKGV4ZWMs IHVybCwgbGluZU51bWJlcik7CisKKyAgICBwYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPmFkZE1l c3NhZ2VUb0NvbnNvbGUobWVzc2FnZSwgbGluZU51bWJlciwgdXJsLnByZXR0eVVSTCgpKTsKKyAg ICBwYWdlLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmFkZE1lc3NhZ2VUb0NvbnNvbGUoSlNNZXNz YWdlU291cmNlLCBMb2dNZXNzYWdlTGV2ZWwsIGV4ZWMsIGFyZ3MsIGxpbmVOdW1iZXIsIHVybC5z dHJpbmcoKSk7CiAKICAgICBwcmludFRvU3RhbmRhcmRPdXQoTG9nTWVzc2FnZUxldmVsLCBleGVj LCBhcmdzLCB1cmwpOwogfQpAQCAtMjU0LDE3ICsyNzMsMTkgQEAgdm9pZCBDb25zb2xlOjphc3Nl cnRDb25kaXRpb24oYm9vbCBjb25kaXRpb24sIEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJnTGlz dCYgYXIKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIGNvbnN0IEtVUkwm IHVybCA9IG1fZnJhbWUtPmxvYWRlcigpLT51cmwoKTsKKyAgICBLVVJMIHVybDsKKyAgICB1bnNp Z25lZCBsaW5lTnVtYmVyOworICAgIHJldHJpZXZlTGFzdENhbGxlcihleGVjLCB1cmwsIGxpbmVO dW1iZXIpOwogCiAgICAgLy8gRklYTUU6IDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTkxMzU+IEl0IHdvdWxkIGJlIG5pY2UgdG8gcHJlZml4IGFzc2VydGlvbiBmYWls dXJlcyB3aXRoIGEgbWVzc2FnZSBsaWtlICJBc3NlcnRpb24gZmFpbGVkOiAiLgogICAgIC8vIEZJ WE1FOiA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTM2PiBXZSBz aG91bGQgcHJpbnQgYSBtZXNzYWdlIGV2ZW4gd2hlbiBhcmdzLmlzRW1wdHkoKSBpcyB0cnVlLgog Ci0gICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5hZGRNZXNzYWdlVG9Db25zb2xlKEpT TWVzc2FnZVNvdXJjZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIGV4ZWMsIGFyZ3MsIDAsIHVybC5zdHJp bmcoKSk7CisgICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5hZGRNZXNzYWdlVG9Db25z b2xlKEpTTWVzc2FnZVNvdXJjZSwgRXJyb3JNZXNzYWdlTGV2ZWwsIGV4ZWMsIGFyZ3MsIGxpbmVO dW1iZXIsIHVybC5zdHJpbmcoKSk7CiAKICAgICBwcmludFRvU3RhbmRhcmRPdXQoRXJyb3JNZXNz YWdlTGV2ZWwsIGV4ZWMsIGFyZ3MsIHVybCk7CiB9CiAKLXZvaWQgQ29uc29sZTo6Y291bnQoY29u c3QgVVN0cmluZyYgdGl0bGUpCit2b2lkIENvbnNvbGU6OmNvdW50KEV4ZWNTdGF0ZSogZXhlYywg Y29uc3QgQXJnTGlzdCYgYXJncykKIHsKICAgICBpZiAoIW1fZnJhbWUpCiAgICAgICAgIHJldHVy bjsKQEAgLTI3Myw5ICsyOTQsMTUgQEAgdm9pZCBDb25zb2xlOjpjb3VudChjb25zdCBVU3RyaW5n JiB0aXRsZSkKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIEZJWE1F OiBwYXNzIHRoZSBmaWxlIGFuZCBsaW5lIG51bWJlciB0byB0aGUgSW5zcGVjdG9yQ29udHJvbGxl cgotICAgIC8vIHdoZW4gd2UgaGF2ZSB0aGlzIGluZm9ybWF0aW9uLgotICAgIHBhZ2UtPmluc3Bl Y3RvckNvbnRyb2xsZXIoKS0+Y291bnQodGl0bGUsIDAsIFN0cmluZygpKTsKKyAgICBLVVJMIHVy bDsKKyAgICB1bnNpZ25lZCBsaW5lTnVtYmVyOworICAgIHJldHJpZXZlTGFzdENhbGxlcihleGVj LCB1cmwsIGxpbmVOdW1iZXIpOworCisgICAgVVN0cmluZyB0aXRsZTsKKyAgICBpZiAoYXJncy5z aXplKCkgPj0gMSkKKyAgICAgICAgdGl0bGUgPSB2YWx1ZVRvU3RyaW5nV2l0aFVuZGVmaW5lZE9y TnVsbENoZWNrKGV4ZWMsIGFyZ3MuYXQoZXhlYywgMCkpOworCisgICAgcGFnZS0+aW5zcGVjdG9y Q29udHJvbGxlcigpLT5jb3VudCh0aXRsZSwgbGluZU51bWJlciwgdXJsLnN0cmluZygpKTsKIH0K IAogdm9pZCBDb25zb2xlOjpwcm9maWxlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJnTGlzdCYg YXJncykKQEAgLTI4OCw3ICszMTUsNyBAQCB2b2lkIENvbnNvbGU6OnByb2ZpbGVFbmQoRXhlY1N0 YXRlKiBleGVjLCBjb25zdCBBcmdMaXN0JiBhcmdzKQogewogICAgIFVTdHJpbmcgdGl0bGU7CiAg ICAgaWYgKGFyZ3Muc2l6ZSgpID49IDEpCi0gICAgICAgIHRpdGxlID0gYXJncy5hdChleGVjLCAw KS0+dG9TdHJpbmcoZXhlYyk7CisgICAgICAgIHRpdGxlID0gdmFsdWVUb1N0cmluZ1dpdGhVbmRl ZmluZWRPck51bGxDaGVjayhleGVjLCBhcmdzLmF0KGV4ZWMsIDApKTsKIAogICAgIGludCBzb3Vy Y2VJZDsKICAgICAvLyBGSVhNRTogV2Ugd29uJ3QgbmVlZCB0byBzYXZlIHRoZXNlIHRvIHN0YXRp Y3Mgb25jZSB3ZSByZW1vdmUgdGhlIHByb2ZpbGVyICJ6b21iaWUiIG1vZGUKQEAgLTMwOCw4ICsz MzUsMTEgQEAgdm9pZCBDb25zb2xlOjp0aW1lKGNvbnN0IFVTdHJpbmcmIHRpdGxlKQogICAgIHBh Z2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+c3RhcnRUaW1pbmcodGl0bGUpOwogfQogCi12b2lk IENvbnNvbGU6OnRpbWVFbmQoY29uc3QgVVN0cmluZyYgdGl0bGUpCit2b2lkIENvbnNvbGU6OnRp bWVFbmQoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBBcmdMaXN0JiBhcmdzKQogeworICAgIFVTdHJp bmcgdGl0bGU7CisgICAgaWYgKGFyZ3Muc2l6ZSgpID49IDEpCisgICAgICAgIHRpdGxlID0gdmFs dWVUb1N0cmluZ1dpdGhVbmRlZmluZWRPck51bGxDaGVjayhleGVjLCBhcmdzLmF0KGV4ZWMsIDAp KTsKICAgICBpZiAodGl0bGUuaXNOdWxsKCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtMzIyLDgg KzM1MiwxMiBAQCB2b2lkIENvbnNvbGU6OnRpbWVFbmQoY29uc3QgVVN0cmluZyYgdGl0bGUpCiAg ICAgICAgIHJldHVybjsKIAogICAgIFN0cmluZyBtZXNzYWdlID0gU3RyaW5nKHRpdGxlKSArIFN0 cmluZzo6Zm9ybWF0KCI6ICUuMGZtcyIsIGVsYXBzZWQpOwotICAgIC8vIEZJWE1FOiA8aHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzkxPiBXZSBzaG91bGQgcGFzcyBp biB0aGUgcmVhbCBzb3VyY2VVUkwgaGVyZSBzbyB0aGF0IHRoZSBJbnNwZWN0b3IgY2FuIHNob3cg aXQuCi0gICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5hZGRNZXNzYWdlVG9Db25zb2xl KEpTTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZUxldmVsLCBtZXNzYWdlLCAwLCBTdHJpbmcoKSk7 CisKKyAgICBLVVJMIHVybDsKKyAgICB1bnNpZ25lZCBsaW5lTnVtYmVyOworICAgIHJldHJpZXZl TGFzdENhbGxlcihleGVjLCB1cmwsIGxpbmVOdW1iZXIpOworCisgICAgcGFnZS0+aW5zcGVjdG9y Q29udHJvbGxlcigpLT5hZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2FnZVNvdXJjZSwgTG9nTWVz c2FnZUxldmVsLCBtZXNzYWdlLCBsaW5lTnVtYmVyLCB1cmwuc3RyaW5nKCkpOwogfQogCiB2b2lk IENvbnNvbGU6Omdyb3VwKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJnTGlzdCYgYXJndW1lbnRz KQpAQCAtMzYzLDExICszOTcsMTMgQEAgdm9pZCBDb25zb2xlOjp3YXJuKEV4ZWNTdGF0ZSogZXhl YywgY29uc3QgQXJnTGlzdCYgYXJncykKICAgICAgICAgcmV0dXJuOwogCiAgICAgU3RyaW5nIG1l c3NhZ2UgPSBhcmdzLmF0KGV4ZWMsIDApLT50b1N0cmluZyhleGVjKTsKLSAgICBjb25zdCBLVVJM JiB1cmwgPSBtX2ZyYW1lLT5sb2FkZXIoKS0+dXJsKCk7Ci0gICAgU3RyaW5nIHByZXR0eVVSTCA9 IHVybC5wcmV0dHlVUkwoKTsKIAotICAgIHBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+YWRkTWVz c2FnZVRvQ29uc29sZShtZXNzYWdlLCAwLCBwcmV0dHlVUkwpOwotICAgIHBhZ2UtPmluc3BlY3Rv ckNvbnRyb2xsZXIoKS0+YWRkTWVzc2FnZVRvQ29uc29sZShKU01lc3NhZ2VTb3VyY2UsIFdhcm5p bmdNZXNzYWdlTGV2ZWwsIGV4ZWMsIGFyZ3MsIDAsIHVybC5zdHJpbmcoKSk7CisgICAgS1VSTCB1 cmw7CisgICAgdW5zaWduZWQgbGluZU51bWJlcjsKKyAgICByZXRyaWV2ZUxhc3RDYWxsZXIoZXhl YywgdXJsLCBsaW5lTnVtYmVyKTsKKworICAgIHBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+YWRk TWVzc2FnZVRvQ29uc29sZShtZXNzYWdlLCBsaW5lTnVtYmVyLCB1cmwucHJldHR5VVJMKCkpOwor ICAgIHBhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+YWRkTWVzc2FnZVRvQ29uc29sZShKU01l c3NhZ2VTb3VyY2UsIFdhcm5pbmdNZXNzYWdlTGV2ZWwsIGV4ZWMsIGFyZ3MsIGxpbmVOdW1iZXIs IHVybC5zdHJpbmcoKSk7CiAKICAgICBwcmludFRvU3RhbmRhcmRPdXQoV2FybmluZ01lc3NhZ2VM ZXZlbCwgZXhlYywgYXJncywgdXJsKTsKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9Db25z b2xlLmggYi9XZWJDb3JlL3BhZ2UvQ29uc29sZS5oCmluZGV4IGY2MzFlODkuLjY2YmFkYTYgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9Db25zb2xlLmgKKysrIGIvV2ViQ29yZS9wYWdlL0NvbnNv bGUuaApAQCAtNzMsMTkgKzczLDE5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2 b2lkIGFkZE1lc3NhZ2UoTWVzc2FnZVNvdXJjZSwgTWVzc2FnZUxldmVsLCBjb25zdCBTdHJpbmcm IG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMKTsK IAotICAgICAgICB2b2lkIGRlYnVnKEtKUzo6RXhlY1N0YXRlKiwgY29uc3QgS0pTOjpBcmdMaXN0 JiBhcmd1bWVudHMpOwotICAgICAgICB2b2lkIGVycm9yKEtKUzo6RXhlY1N0YXRlKiwgY29uc3Qg S0pTOjpBcmdMaXN0JiBhcmd1bWVudHMpOwotICAgICAgICB2b2lkIGluZm8oS0pTOjpFeGVjU3Rh dGUqLCBjb25zdCBLSlM6OkFyZ0xpc3QmIGFyZ3VtZW50cyk7Ci0gICAgICAgIHZvaWQgbG9nKEtK Uzo6RXhlY1N0YXRlKiwgY29uc3QgS0pTOjpBcmdMaXN0JiBhcmd1bWVudHMpOwotICAgICAgICB2 b2lkIHdhcm4oS0pTOjpFeGVjU3RhdGUqLCBjb25zdCBLSlM6OkFyZ0xpc3QmIGFyZ3VtZW50cyk7 Ci0gICAgICAgIHZvaWQgZGlyKEtKUzo6RXhlY1N0YXRlKiwgY29uc3QgS0pTOjpBcmdMaXN0JiBh cmd1bWVudHMpOwotICAgICAgICB2b2lkIGFzc2VydENvbmRpdGlvbihib29sIGNvbmRpdGlvbiwg S0pTOjpFeGVjU3RhdGUqLCBjb25zdCBLSlM6OkFyZ0xpc3QmIGFyZ3VtZW50cyk7Ci0gICAgICAg IHZvaWQgY291bnQoY29uc3QgS0pTOjpVU3RyaW5nJiB0aXRsZSk7Ci0gICAgICAgIHZvaWQgcHJv ZmlsZShLSlM6OkV4ZWNTdGF0ZSosIGNvbnN0IEtKUzo6QXJnTGlzdCYgYXJndW1lbnRzKTsKLSAg ICAgICAgdm9pZCBwcm9maWxlRW5kKEtKUzo6RXhlY1N0YXRlKiwgY29uc3QgS0pTOjpBcmdMaXN0 JiBhcmd1bWVudHMpOworICAgICAgICB2b2lkIGRlYnVnKEtKUzo6RXhlY1N0YXRlKiwgY29uc3Qg S0pTOjpBcmdMaXN0Jik7CisgICAgICAgIHZvaWQgZXJyb3IoS0pTOjpFeGVjU3RhdGUqLCBjb25z dCBLSlM6OkFyZ0xpc3QmKTsKKyAgICAgICAgdm9pZCBpbmZvKEtKUzo6RXhlY1N0YXRlKiwgY29u c3QgS0pTOjpBcmdMaXN0Jik7CisgICAgICAgIHZvaWQgbG9nKEtKUzo6RXhlY1N0YXRlKiwgY29u c3QgS0pTOjpBcmdMaXN0Jik7CisgICAgICAgIHZvaWQgd2FybihLSlM6OkV4ZWNTdGF0ZSosIGNv bnN0IEtKUzo6QXJnTGlzdCYpOworICAgICAgICB2b2lkIGRpcihLSlM6OkV4ZWNTdGF0ZSosIGNv bnN0IEtKUzo6QXJnTGlzdCYpOworICAgICAgICB2b2lkIGFzc2VydENvbmRpdGlvbihib29sIGNv bmRpdGlvbiwgS0pTOjpFeGVjU3RhdGUqLCBjb25zdCBLSlM6OkFyZ0xpc3QmKTsKKyAgICAgICAg dm9pZCBjb3VudChLSlM6OkV4ZWNTdGF0ZSosIGNvbnN0IEtKUzo6QXJnTGlzdCYpOworICAgICAg ICB2b2lkIHByb2ZpbGUoS0pTOjpFeGVjU3RhdGUqLCBjb25zdCBLSlM6OkFyZ0xpc3QmKTsKKyAg ICAgICAgdm9pZCBwcm9maWxlRW5kKEtKUzo6RXhlY1N0YXRlKiwgY29uc3QgS0pTOjpBcmdMaXN0 Jik7CiAgICAgICAgIHZvaWQgdGltZShjb25zdCBLSlM6OlVTdHJpbmcmIHRpdGxlKTsKLSAgICAg ICAgdm9pZCB0aW1lRW5kKGNvbnN0IEtKUzo6VVN0cmluZyYgdGl0bGUpOwotICAgICAgICB2b2lk IGdyb3VwKEtKUzo6RXhlY1N0YXRlKiwgY29uc3QgS0pTOjpBcmdMaXN0JiBhcmd1bWVudHMpOwor ICAgICAgICB2b2lkIHRpbWVFbmQoS0pTOjpFeGVjU3RhdGUqLCBjb25zdCBLSlM6OkFyZ0xpc3Qm KTsKKyAgICAgICAgdm9pZCBncm91cChLSlM6OkV4ZWNTdGF0ZSosIGNvbnN0IEtKUzo6QXJnTGlz dCYpOwogICAgICAgICB2b2lkIGdyb3VwRW5kKCk7CiAKICAgICAgICAgdm9pZCBmaW5pc2hlZFBy b2ZpbGluZyhQYXNzUmVmUHRyPEtKUzo6UHJvZmlsZT4pOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w YWdlL0NvbnNvbGUuaWRsIGIvV2ViQ29yZS9wYWdlL0NvbnNvbGUuaWRsCmluZGV4IDMxMDU0ZGQu LmJlY2YxYTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9Db25zb2xlLmlkbAorKysgYi9XZWJD b3JlL3BhZ2UvQ29uc29sZS5pZGwKQEAgLTM2LDEyICszNiwxMiBAQCBtb2R1bGUgd2luZG93IHsK ICAgICAgICAgW0N1c3RvbV0gdm9pZCB3YXJuKCk7CiAgICAgICAgIFtDdXN0b21dIHZvaWQgZGly KCk7CiAgICAgICAgIFtDdXN0b20sIEltcGxlbWVudGF0aW9uRnVuY3Rpb249YXNzZXJ0Q29uZGl0 aW9uXSB2b2lkIGFzc2VydChpbiBib29sZWFuIGNvbmRpdGlvbik7Ci0gICAgICAgIHZvaWQgY291 bnQoaW4gW0NvbnZlcnRVbmRlZmluZWRPck51bGxUb051bGxTdHJpbmddIERPTVN0cmluZyB0aXRs ZSk7CisgICAgICAgIFtDdXN0b21dIHZvaWQgY291bnQoKTsKIAogICAgICAgICBbQ3VzdG9tXSB2 b2lkIHByb2ZpbGUoaW4gRE9NU3RyaW5nIHRpdGxlKTsKICAgICAgICAgW0N1c3RvbV0gdm9pZCBw cm9maWxlRW5kKCk7CiAgICAgICAgIHZvaWQgdGltZShpbiBbQ29udmVydFVuZGVmaW5lZE9yTnVs bFRvTnVsbFN0cmluZ10gRE9NU3RyaW5nIHRpdGxlKTsKLSAgICAgICAgdm9pZCB0aW1lRW5kKGlu IFtDb252ZXJ0VW5kZWZpbmVkT3JOdWxsVG9OdWxsU3RyaW5nXSBET01TdHJpbmcgdGl0bGUpOwor ICAgICAgICBbQ3VzdG9tXSB2b2lkIHRpbWVFbmQoKTsKICAgICAgICAgW0N1c3RvbV0gdm9pZCBn cm91cCgpOwogICAgICAgICB2b2lkIGdyb3VwRW5kKCk7CiAgICAgfTsKLS0gCjEuNi4wLnJjMwoK