148341 2015-08-21 16:02:49 -0700 Debugger's VM should never be null 2015-08-24 02:21:33 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 148347 1 ggaren ggaren achristensen bburg bfulgham commit-queue joepeck ossy peavo timothy oldest_to_newest 1119975 0 ggaren 2015-08-21 16:02:49 -0700 Debugger's VM should never be null 1119976 1 259680 ggaren 2015-08-21 16:05:24 -0700 Created attachment 259680 Patch 1119977 2 259680 saam 2015-08-21 16:07:40 -0700 Comment on attachment 259680 Patch LGTM 1119983 3 259680 joepeck 2015-08-21 16:19:37 -0700 Comment on attachment 259680 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259680&action=review r=me > Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.cpp:31 > +#include "JSGlobalObject.h" I'm not sure this include is needed. There is no new code in this file. > Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.cpp:77 > void JSGlobalObjectScriptDebugServer::recompileAllJSFunctions() > { > - JSC::Debugger::recompileAllJSFunctions(&m_globalObject.vm()); > + JSC::Debugger::recompileAllJSFunctions(); > } Seems you can just remove this virtual method, it just calls its superclass. > Source/JavaScriptCore/inspector/ScriptDebugServer.h:121 > -#endif // ScriptDebugServer_h > +#endif // ScriptDebugSer*er_h Oops > Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp:87 > JSC::JSLockHolder lock(vm); In WorkerScriptDebugServer and PageScriptDebugServer these could both be simplified if they just used (m_vm) instead of re-looking up the vm, that would require an accessor on Debugger. Up to you. 1120004 4 ggaren 2015-08-21 16:57:14 -0700 Committed r188803: <http://trac.webkit.org/changeset/188803> 1120019 5 commit-queue 2015-08-21 17:49:31 -0700 Re-opened since this is blocked by bug 148347 1120197 6 ggaren 2015-08-23 14:28:48 -0700 Committed r188841: <http://trac.webkit.org/changeset/188841> 1120201 7 ossy 2015-08-23 14:47:54 -0700 (In reply to comment #6) > Committed r188841: <http://trac.webkit.org/changeset/188841> It broke the WinCairo build: https://build.webkit.org/builders/WinCairo%2064-Bit%20Release/builds/48606 1120258 8 ossy 2015-08-24 02:21:33 -0700 (In reply to comment #7) > (In reply to comment #6) > > Committed r188841: <http://trac.webkit.org/changeset/188841> > > It broke the WinCairo build: > https://build.webkit.org/builders/WinCairo%2064-Bit%20Release/builds/48606 build log: c:\users\alex\documents\wincairobot\win-cairo-release\build\source\webcore\inspector\PageScriptDebugServer.cpp(57): error C2661: 'Inspector::ScriptDebugServer::ScriptDebugServer': no overloaded function takes 2 arguments c:\users\alex\documents\wincairobot\win-cairo-release\build\source\webcore\inspector\PageScriptDebugServer.cpp(90): error C3861: 'vm': identifier not found c:\users\alex\documents\wincairobot\win-cairo-release\build\source\webcore\inspector\PageScriptDebugServer.cpp(91): error C2660: 'JSC::Debugger::recompileAllJSFunctions': function does not take 0 arguments c:\users\alex\documents\wincairobot\win-cairo-release\build\source\webcore\inspector\PageScriptDebugServer.cpp(57): error C2661: 'Inspector::ScriptDebugServer::ScriptDebugServer': no overloaded function takes 2 arguments c:\users\alex\documents\wincairobot\win-cairo-release\build\source\webcore\inspector\PageScriptDebugServer.cpp(90): error C3861: 'vm': identifier not found c:\users\alex\documents\wincairobot\win-cairo-release\build\source\webcore\inspector\PageScriptDebugServer.cpp(91): error C2660: 'JSC::Debugger::recompileAllJSFunctions': function does not take 0 arguments 259680 2015-08-21 16:05:24 -0700 2015-08-21 16:19:37 -0700 Patch bug-148341-20150821160518.patch text/plain 13552 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg4NzkyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQzIEBA CisyMDE1LTA4LTIxICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgRGVidWdnZXIncyBWTSBzaG91bGQgbmV2ZXIgYmUgbnVsbAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4MzQxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgZG9lc24ndCBtYWtlIHNlbnNlIGZvciBh IERlYnVnZ2VyJ3MgVk0gdG8gYmUgbnVsbCwgYW5kIGNvZGUgcmVsYXRlZAorICAgICAgICB0byBt YWludGFpbmluZyB0aGF0IGlsbHVzaW9uIGp1c3QgY2F1c2VkIHRoZSBXZWIgSW5zcGVjdG9yIHRv IGNyYXNoIG9uCisgICAgICAgIGxhdW5jaCAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0ODMxMikuIFNvLCBsZXQncyBzdG9wCisgICAgICAgIGRvaW5nIHRoYXQuCisK KyAgICAgICAgTm93LCBEZWJ1Z2dlciByZXF1aXJlcyBpdHMgc3ViY2xhc3MgdG8gcHJvdmlkZSBh IG5ldmVyLW51bGwgVk0mLgorCisgICAgICAgICogZGVidWdnZXIvRGVidWdnZXIuY3BwOgorICAg ICAgICAoSlNDOjpEZWJ1Z2dlcjo6RGVidWdnZXIpOgorICAgICAgICAoSlNDOjpEZWJ1Z2dlcjo6 YXR0YWNoKToKKyAgICAgICAgKEpTQzo6RGVidWdnZXI6OmRldGFjaCk6CisgICAgICAgIChKU0M6 OkRlYnVnZ2VyOjppc0F0dGFjaGVkKToKKyAgICAgICAgKEpTQzo6RGVidWdnZXI6OnNldFN0ZXBw aW5nTW9kZSk6CisgICAgICAgIChKU0M6OkRlYnVnZ2VyOjpyZWdpc3RlckNvZGVCbG9jayk6Cisg ICAgICAgIChKU0M6OkRlYnVnZ2VyOjp0b2dnbGVCcmVha3BvaW50KToKKyAgICAgICAgKEpTQzo6 RGVidWdnZXI6OnJlY29tcGlsZUFsbEpTRnVuY3Rpb25zKToKKyAgICAgICAgKEpTQzo6RGVidWdn ZXI6OnNldEJyZWFrcG9pbnQpOgorICAgICAgICAoSlNDOjpEZWJ1Z2dlcjo6Y2xlYXJCcmVha3Bv aW50cyk6CisgICAgICAgIChKU0M6OkRlYnVnZ2VyOjpjbGVhckRlYnVnZ2VyUmVxdWVzdHMpOgor ICAgICAgICAoSlNDOjpEZWJ1Z2dlcjo6c2V0QnJlYWtwb2ludHNBY3RpdmF0ZWQpOgorICAgICAg ICAoSlNDOjpEZWJ1Z2dlcjo6YnJlYWtQcm9ncmFtKToKKyAgICAgICAgKEpTQzo6RGVidWdnZXI6 OnN0ZXBPdXRPZkZ1bmN0aW9uKToKKyAgICAgICAgKEpTQzo6RGVidWdnZXI6OnJldHVybkV2ZW50 KToKKyAgICAgICAgKEpTQzo6RGVidWdnZXI6OmRpZEV4ZWN1dGVQcm9ncmFtKToKKyAgICAgICAg KiBkZWJ1Z2dlci9EZWJ1Z2dlci5oOgorICAgICAgICAqIGluc3BlY3Rvci9KU0dsb2JhbE9iamVj dFNjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6SlNHbG9iYWxPYmpl Y3RTY3JpcHREZWJ1Z1NlcnZlcjo6SlNHbG9iYWxPYmplY3RTY3JpcHREZWJ1Z1NlcnZlcik6Cisg ICAgICAgIChJbnNwZWN0b3I6OkpTR2xvYmFsT2JqZWN0U2NyaXB0RGVidWdTZXJ2ZXI6OnJlY29t cGlsZUFsbEpTRnVuY3Rpb25zKToKKyAgICAgICAgKEluc3BlY3Rvcjo6SlNHbG9iYWxPYmplY3RT Y3JpcHREZWJ1Z1NlcnZlcjo6cnVuRXZlbnRMb29wV2hpbGVQYXVzZWQpOgorICAgICAgICAqIGlu c3BlY3Rvci9TY3JpcHREZWJ1Z1NlcnZlci5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OlNjcmlw dERlYnVnU2VydmVyOjpTY3JpcHREZWJ1Z1NlcnZlcik6CisgICAgICAgICogaW5zcGVjdG9yL1Nj cmlwdERlYnVnU2VydmVyLmg6CisKIDIwMTUtMDgtMjEgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVu QGFwcGxlLmNvbT4KIAogICAgICAgICBVbmlmeSBjb2RlIHBhdGhzIGZvciBtYW51YWxseSBkZWxl dGluZyBhbGwgY29kZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RlYnVnZ2VyL0RlYnVn Z2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVi dWdnZXIuY3BwCShyZXZpc2lvbiAxODg3OTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVi dWdnZXIvRGVidWdnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OSw4ICs3OSw4IEBAIHByaXZh dGU6CiAgICAgRGVidWdnZXImIG1fZGVidWdnZXI7CiB9OwogCi1EZWJ1Z2dlcjo6RGVidWdnZXIo Ym9vbCBpc0luV29ya2VyVGhyZWFkKQotICAgIDogbV92bShudWxscHRyKQorRGVidWdnZXI6OkRl YnVnZ2VyKFZNJiB2bSwgYm9vbCBpc0luV29ya2VyVGhyZWFkKQorICAgIDogbV92bSh2bSkKICAg ICAsIG1fcGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZShEb250UGF1c2VPbkV4Y2VwdGlvbnMpCiAgICAg LCBtX3BhdXNlT25OZXh0U3RhdGVtZW50KGZhbHNlKQogICAgICwgbV9pc1BhdXNlZChmYWxzZSkK QEAgLTEwOCwxNiArMTA4LDEyIEBAIERlYnVnZ2VyOjp+RGVidWdnZXIoKQogdm9pZCBEZWJ1Z2dl cjo6YXR0YWNoKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QpCiB7CiAgICAgQVNTRVJUKCFn bG9iYWxPYmplY3QtPmRlYnVnZ2VyKCkpOwotICAgIGlmICghbV92bSkKLSAgICAgICAgbV92bSA9 ICZnbG9iYWxPYmplY3QtPnZtKCk7Ci0gICAgZWxzZQotICAgICAgICBBU1NFUlQobV92bSA9PSAm Z2xvYmFsT2JqZWN0LT52bSgpKTsKICAgICBnbG9iYWxPYmplY3QtPnNldERlYnVnZ2VyKHRoaXMp OwogICAgIG1fZ2xvYmFsT2JqZWN0cy5hZGQoZ2xvYmFsT2JqZWN0KTsKIAogICAgIC8vIENhbGwg c291cmNlUGFyc2VkKCkgYmVjYXVzZSBpdCB3aWxsIGV4ZWN1dGUgSmF2YVNjcmlwdCBpbiB0aGUg aW5zcGVjdG9yLgotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV92bS0+aGVhcC5jb21waWxl ZENvZGUoKS5zaXplKCk7ICsraSkgewotICAgICAgICBFeGVjdXRhYmxlQmFzZSogYmFzZSA9IG1f dm0tPmhlYXAuY29tcGlsZWRDb2RlKClbaV07CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBt X3ZtLmhlYXAuY29tcGlsZWRDb2RlKCkuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgRXhlY3V0YWJs ZUJhc2UqIGJhc2UgPSBtX3ZtLmhlYXAuY29tcGlsZWRDb2RlKClbaV07CiAgICAgICAgIGlmICgh YmFzZS0+aXNGdW5jdGlvbkV4ZWN1dGFibGUoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICBGdW5jdGlvbkV4ZWN1dGFibGUqIGV4ZWN1dGFibGUgPSBzdGF0aWNfY2FzdDxGdW5jdGlv bkV4ZWN1dGFibGUqPihiYXNlKTsKQEAgLTE0Niw4ICsxNDIsNiBAQCB2b2lkIERlYnVnZ2VyOjpk ZXRhY2goSlNHbG9iYWxPYmplY3QqIGdsCiAgICAgICAgIGNsZWFyRGVidWdnZXJSZXF1ZXN0cyhn bG9iYWxPYmplY3QpOwogCiAgICAgZ2xvYmFsT2JqZWN0LT5zZXREZWJ1Z2dlcigwKTsKLSAgICBp ZiAoIW1fZ2xvYmFsT2JqZWN0cy5zaXplKCkpCi0gICAgICAgIG1fdm0gPSBudWxscHRyOwogfQog CiBib29sIERlYnVnZ2VyOjppc0F0dGFjaGVkKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3Qp CkBAIC0xODEsMTIgKzE3NSwxMiBAQCBwcml2YXRlOgogCiB2b2lkIERlYnVnZ2VyOjpzZXRTdGVw cGluZ01vZGUoU3RlcHBpbmdNb2RlIG1vZGUpCiB7Ci0gICAgaWYgKG1vZGUgPT0gbV9zdGVwcGlu Z01vZGUgfHwgIW1fdm0pCisgICAgaWYgKG1vZGUgPT0gbV9zdGVwcGluZ01vZGUpCiAgICAgICAg IHJldHVybjsKIAogICAgIG1fc3RlcHBpbmdNb2RlID0gbW9kZTsKICAgICBTZXRTdGVwcGluZ01v ZGVGdW5jdG9yIGZ1bmN0b3IodGhpcywgbW9kZSk7Ci0gICAgbV92bS0+aGVhcC5mb3JFYWNoQ29k ZUJsb2NrKGZ1bmN0b3IpOworICAgIG1fdm0uaGVhcC5mb3JFYWNoQ29kZUJsb2NrKGZ1bmN0b3Ip OwogfQogCiB2b2lkIERlYnVnZ2VyOjpyZWdpc3RlckNvZGVCbG9jayhDb2RlQmxvY2sqIGNvZGVC bG9jaykKQEAgLTI3MSwxNSArMjY1LDEzIEBAIHByaXZhdGU6CiAKIHZvaWQgRGVidWdnZXI6OnRv Z2dsZUJyZWFrcG9pbnQoQnJlYWtwb2ludCYgYnJlYWtwb2ludCwgRGVidWdnZXI6OkJyZWFrcG9p bnRTdGF0ZSBlbmFibGVkT3JOb3QpCiB7Ci0gICAgaWYgKCFtX3ZtKQotICAgICAgICByZXR1cm47 CiAgICAgVG9nZ2xlQnJlYWtwb2ludEZ1bmN0b3IgZnVuY3Rvcih0aGlzLCBicmVha3BvaW50LCBl bmFibGVkT3JOb3QpOwotICAgIG1fdm0tPmhlYXAuZm9yRWFjaENvZGVCbG9jayhmdW5jdG9yKTsK KyAgICBtX3ZtLmhlYXAuZm9yRWFjaENvZGVCbG9jayhmdW5jdG9yKTsKIH0KIAotdm9pZCBEZWJ1 Z2dlcjo6cmVjb21waWxlQWxsSlNGdW5jdGlvbnMoVk0qIHZtKQordm9pZCBEZWJ1Z2dlcjo6cmVj b21waWxlQWxsSlNGdW5jdGlvbnMoKQogewotICAgIHZtLT5kZWxldGVBbGxDb2RlKCk7CisgICAg bV92bS5kZWxldGVBbGxDb2RlKCk7CiB9CiAKIEJyZWFrcG9pbnRJRCBEZWJ1Z2dlcjo6c2V0QnJl YWtwb2ludChCcmVha3BvaW50IGJyZWFrcG9pbnQsIHVuc2lnbmVkJiBhY3R1YWxMaW5lLCB1bnNp Z25lZCYgYWN0dWFsQ29sdW1uKQpAQCAtNDQ0LDEwICs0MzYsOCBAQCB2b2lkIERlYnVnZ2VyOjpj bGVhckJyZWFrcG9pbnRzKCkKICAgICBtX2JyZWFrcG9pbnRJRFRvQnJlYWtwb2ludC5jbGVhcigp OwogICAgIG1fc291cmNlSURUb0JyZWFrcG9pbnRzLmNsZWFyKCk7CiAKLSAgICBpZiAoIW1fdm0p Ci0gICAgICAgIHJldHVybjsKICAgICBDbGVhckNvZGVCbG9ja0RlYnVnZ2VyUmVxdWVzdHNGdW5j dG9yIGZ1bmN0b3IodGhpcyk7Ci0gICAgbV92bS0+aGVhcC5mb3JFYWNoQ29kZUJsb2NrKGZ1bmN0 b3IpOworICAgIG1fdm0uaGVhcC5mb3JFYWNoQ29kZUJsb2NrKGZ1bmN0b3IpOwogfQogCiBjbGFz cyBEZWJ1Z2dlcjo6Q2xlYXJEZWJ1Z2dlclJlcXVlc3RzRnVuY3RvciB7CkBAIC00NzAsOSArNDYw LDggQEAgcHJpdmF0ZToKIAogdm9pZCBEZWJ1Z2dlcjo6Y2xlYXJEZWJ1Z2dlclJlcXVlc3RzKEpT R2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QpCiB7Ci0gICAgQVNTRVJUKG1fdm0pOwogICAgIENs ZWFyRGVidWdnZXJSZXF1ZXN0c0Z1bmN0b3IgZnVuY3RvcihnbG9iYWxPYmplY3QpOwotICAgIG1f dm0tPmhlYXAuZm9yRWFjaENvZGVCbG9jayhmdW5jdG9yKTsKKyAgICBtX3ZtLmhlYXAuZm9yRWFj aENvZGVCbG9jayhmdW5jdG9yKTsKIH0KIAogdm9pZCBEZWJ1Z2dlcjo6c2V0QnJlYWtwb2ludHNB Y3RpdmF0ZWQoYm9vbCBhY3RpdmF0ZWQpCkBAIC00OTksNyArNDg4LDcgQEAgdm9pZCBEZWJ1Z2dl cjo6YnJlYWtQcm9ncmFtKCkKIAogICAgIG1fcGF1c2VPbk5leHRTdGF0ZW1lbnQgPSB0cnVlOwog ICAgIHNldFN0ZXBwaW5nTW9kZShTdGVwcGluZ01vZGVFbmFibGVkKTsKLSAgICBtX2N1cnJlbnRD YWxsRnJhbWUgPSBtX3ZtLT50b3BDYWxsRnJhbWU7CisgICAgbV9jdXJyZW50Q2FsbEZyYW1lID0g bV92bS50b3BDYWxsRnJhbWU7CiAgICAgQVNTRVJUKG1fY3VycmVudENhbGxGcmFtZSk7CiAgICAg cGF1c2VJZk5lZWRlZChtX2N1cnJlbnRDYWxsRnJhbWUpOwogfQpAQCAtNTM3LDcgKzUyNiw3IEBA IHZvaWQgRGVidWdnZXI6OnN0ZXBPdXRPZkZ1bmN0aW9uKCkKICAgICBpZiAoIW1faXNQYXVzZWQp CiAgICAgICAgIHJldHVybjsKIAotICAgIFZNRW50cnlGcmFtZSogdG9wVk1FbnRyeUZyYW1lID0g bV92bS0+dG9wVk1FbnRyeUZyYW1lOworICAgIFZNRW50cnlGcmFtZSogdG9wVk1FbnRyeUZyYW1l ID0gbV92bS50b3BWTUVudHJ5RnJhbWU7CiAgICAgbV9wYXVzZU9uQ2FsbEZyYW1lID0gbV9jdXJy ZW50Q2FsbEZyYW1lID8gbV9jdXJyZW50Q2FsbEZyYW1lLT5jYWxsZXJGcmFtZSh0b3BWTUVudHJ5 RnJhbWUpIDogMDsKICAgICBub3RpZnlEb25lUHJvY2Vzc2luZ0RlYnVnZ2VyRXZlbnRzKCk7CiB9 CkBAIC02NjEsMTEgKzY1MCwxMSBAQCB2b2lkIERlYnVnZ2VyOjpyZXR1cm5FdmVudChDYWxsRnJh bWUqIGNhCiAKICAgICAvLyBUcmVhdCBzdGVwcGluZyBvdmVyIGEgcmV0dXJuIHN0YXRlbWVudCBs aWtlIHN0ZXBwaW5nIG91dC4KICAgICBpZiAobV9jdXJyZW50Q2FsbEZyYW1lID09IG1fcGF1c2VP bkNhbGxGcmFtZSkgewotICAgICAgICBWTUVudHJ5RnJhbWUqIHRvcFZNRW50cnlGcmFtZSA9IG1f dm0tPnRvcFZNRW50cnlGcmFtZTsKKyAgICAgICAgVk1FbnRyeUZyYW1lKiB0b3BWTUVudHJ5RnJh bWUgPSBtX3ZtLnRvcFZNRW50cnlGcmFtZTsKICAgICAgICAgbV9wYXVzZU9uQ2FsbEZyYW1lID0g bV9jdXJyZW50Q2FsbEZyYW1lLT5jYWxsZXJGcmFtZSh0b3BWTUVudHJ5RnJhbWUpOwogICAgIH0K IAotICAgIFZNRW50cnlGcmFtZSogdG9wVk1FbnRyeUZyYW1lID0gbV92bS0+dG9wVk1FbnRyeUZy YW1lOworICAgIFZNRW50cnlGcmFtZSogdG9wVk1FbnRyeUZyYW1lID0gbV92bS50b3BWTUVudHJ5 RnJhbWU7CiAgICAgbV9jdXJyZW50Q2FsbEZyYW1lID0gbV9jdXJyZW50Q2FsbEZyYW1lLT5jYWxs ZXJGcmFtZSh0b3BWTUVudHJ5RnJhbWUpOwogfQogCkBAIC02OTYsMTIgKzY4NSwxMiBAQCB2b2lk IERlYnVnZ2VyOjpkaWRFeGVjdXRlUHJvZ3JhbShDYWxsRnJhCiAgICAgaWYgKCFtX2N1cnJlbnRD YWxsRnJhbWUpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAobV9jdXJyZW50Q2FsbEZyYW1lID09 IG1fcGF1c2VPbkNhbGxGcmFtZSkgewotICAgICAgICBWTUVudHJ5RnJhbWUqIHRvcFZNRW50cnlG cmFtZSA9IG1fdm0tPnRvcFZNRW50cnlGcmFtZTsKKyAgICAgICAgVk1FbnRyeUZyYW1lKiB0b3BW TUVudHJ5RnJhbWUgPSBtX3ZtLnRvcFZNRW50cnlGcmFtZTsKICAgICAgICAgbV9wYXVzZU9uQ2Fs bEZyYW1lID0gbV9jdXJyZW50Q2FsbEZyYW1lLT5jYWxsZXJGcmFtZSh0b3BWTUVudHJ5RnJhbWUp OwogICAgICAgICBpZiAoIW1fY3VycmVudENhbGxGcmFtZSkKICAgICAgICAgICAgIHJldHVybjsK ICAgICB9Ci0gICAgVk1FbnRyeUZyYW1lKiB0b3BWTUVudHJ5RnJhbWUgPSBtX3ZtLT50b3BWTUVu dHJ5RnJhbWU7CisgICAgVk1FbnRyeUZyYW1lKiB0b3BWTUVudHJ5RnJhbWUgPSBtX3ZtLnRvcFZN RW50cnlGcmFtZTsKICAgICBtX2N1cnJlbnRDYWxsRnJhbWUgPSBtX2N1cnJlbnRDYWxsRnJhbWUt PmNhbGxlckZyYW1lKHRvcFZNRW50cnlGcmFtZSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlci5oCShyZXZpc2lvbiAxODg3OTEpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDQs NyArNDQsNyBAQCB0eXBlZGVmIEV4ZWNTdGF0ZSBDYWxsRnJhbWU7CiAKIGNsYXNzIEpTX0VYUE9S VF9QUklWQVRFIERlYnVnZ2VyIHsKIHB1YmxpYzoKLSAgICBEZWJ1Z2dlcihib29sIGlzSW5Xb3Jr ZXJUaHJlYWQgPSBmYWxzZSk7CisgICAgRGVidWdnZXIoVk0mLCBib29sIGlzSW5Xb3JrZXJUaHJl YWQgPSBmYWxzZSk7CiAgICAgdmlydHVhbCB+RGVidWdnZXIoKTsKIAogICAgIEpTQzo6RGVidWdn ZXJDYWxsRnJhbWUqIGN1cnJlbnREZWJ1Z2dlckNhbGxGcmFtZSgpIGNvbnN0OwpAQCAtMTE4LDcg KzExOCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZEV4ZWN1dGVQcm9ncmFtKENhbGxGcmFtZSop OwogICAgIHZvaWQgZGlkUmVhY2hCcmVha3BvaW50KENhbGxGcmFtZSopOwogCi0gICAgdm9pZCBy ZWNvbXBpbGVBbGxKU0Z1bmN0aW9ucyhWTSopOworICAgIHZvaWQgcmVjb21waWxlQWxsSlNGdW5j dGlvbnMoKTsKIAogICAgIHZvaWQgcmVnaXN0ZXJDb2RlQmxvY2soQ29kZUJsb2NrKik7CiAKQEAg LTE4NSw3ICsxODUsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBjbGVhckRlYnVnZ2VyUmVxdWVz dHMoSlNHbG9iYWxPYmplY3QqKTsKIAotICAgIFZNKiBtX3ZtOworICAgIFZNJiBtX3ZtOwogICAg IEhhc2hTZXQ8SlNHbG9iYWxPYmplY3QqPiBtX2dsb2JhbE9iamVjdHM7CiAKICAgICBQYXVzZU9u RXhjZXB0aW9uc1N0YXRlIG1fcGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZTsKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNHbG9iYWxPYmplY3RTY3JpcHREZWJ1Z1NlcnZlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0dsb2Jh bE9iamVjdFNjcmlwdERlYnVnU2VydmVyLmNwcAkocmV2aXNpb24gMTg4NzkxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0dsb2JhbE9iamVjdFNjcmlwdERlYnVnU2VydmVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaW5jbHVkZSAiRXZlbnRM b29wLmgiCiAjaW5jbHVkZSAiSlNDSW5saW5lcy5oIgorI2luY2x1ZGUgIkpTR2xvYmFsT2JqZWN0 LmgiCiAjaW5jbHVkZSAiSlNMb2NrLmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBKU0M7CkBAIC0zNSw3 ICszNiw3IEBAIHVzaW5nIG5hbWVzcGFjZSBKU0M7CiBuYW1lc3BhY2UgSW5zcGVjdG9yIHsKIAog SlNHbG9iYWxPYmplY3RTY3JpcHREZWJ1Z1NlcnZlcjo6SlNHbG9iYWxPYmplY3RTY3JpcHREZWJ1 Z1NlcnZlcihKU0dsb2JhbE9iamVjdCYgZ2xvYmFsT2JqZWN0KQotICAgIDogU2NyaXB0RGVidWdT ZXJ2ZXIoZmFsc2UpCisgICAgOiBTY3JpcHREZWJ1Z1NlcnZlcihnbG9iYWxPYmplY3Qudm0oKSwg ZmFsc2UpCiAgICAgLCBtX2dsb2JhbE9iamVjdChnbG9iYWxPYmplY3QpCiB7CiB9CkBAIC03Miw3 ICs3Myw3IEBAIHZvaWQgSlNHbG9iYWxPYmplY3RTY3JpcHREZWJ1Z1NlcnZlcjo6cmUKIAogdm9p ZCBKU0dsb2JhbE9iamVjdFNjcmlwdERlYnVnU2VydmVyOjpyZWNvbXBpbGVBbGxKU0Z1bmN0aW9u cygpCiB7Ci0gICAgSlNDOjpEZWJ1Z2dlcjo6cmVjb21waWxlQWxsSlNGdW5jdGlvbnMoJm1fZ2xv YmFsT2JqZWN0LnZtKCkpOworICAgIEpTQzo6RGVidWdnZXI6OnJlY29tcGlsZUFsbEpTRnVuY3Rp b25zKCk7CiB9CiAKIHZvaWQgSlNHbG9iYWxPYmplY3RTY3JpcHREZWJ1Z1NlcnZlcjo6cnVuRXZl bnRMb29wV2hpbGVQYXVzZWQoKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z1NlcnZlci5jcHAJKHJldmlzaW9uIDE4ODc5MSkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00Nyw4ICs0Nyw4IEBAIHVzaW5nIG5hbWVzcGFjZSBKU0M7CiAKIG5h bWVzcGFjZSBJbnNwZWN0b3IgewogCi1TY3JpcHREZWJ1Z1NlcnZlcjo6U2NyaXB0RGVidWdTZXJ2 ZXIoYm9vbCBpc0luV29ya2VyVGhyZWFkKQotICAgIDogRGVidWdnZXIoaXNJbldvcmtlclRocmVh ZCkKK1NjcmlwdERlYnVnU2VydmVyOjpTY3JpcHREZWJ1Z1NlcnZlcihWTSYgdm0sIGJvb2wgaXNJ bldvcmtlclRocmVhZCkKKyAgICA6IERlYnVnZ2VyKHZtLCBpc0luV29ya2VyVGhyZWFkKQogewog fQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnU2Vy dmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9TY3Jp cHREZWJ1Z1NlcnZlci5oCShyZXZpc2lvbiAxODg3OTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnU2VydmVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYg KzQ0LDcgQEAKIG5hbWVzcGFjZSBKU0MgewogY2xhc3MgRXhlY1N0YXRlOwogY2xhc3MgSlNHbG9i YWxPYmplY3Q7CitjbGFzcyBWTTsKIH0KIAogbmFtZXNwYWNlIEluc3BlY3RvciB7CkBAIC03MSw3 ICs3Miw3IEBAIHByb3RlY3RlZDoKICAgICB0eXBlZGVmIEhhc2hTZXQ8U2NyaXB0RGVidWdMaXN0 ZW5lcio+IExpc3RlbmVyU2V0OwogICAgIHR5cGVkZWYgdm9pZCAoU2NyaXB0RGVidWdTZXJ2ZXI6 OipKYXZhU2NyaXB0RXhlY3V0aW9uQ2FsbGJhY2spKFNjcmlwdERlYnVnTGlzdGVuZXIqKTsKIAot ICAgIFNjcmlwdERlYnVnU2VydmVyKGJvb2wgaXNJbldvcmtlclRocmVhZCA9IGZhbHNlKTsKKyAg ICBTY3JpcHREZWJ1Z1NlcnZlcihKU0M6OlZNJiwgYm9vbCBpc0luV29ya2VyVGhyZWFkID0gZmFs c2UpOwogICAgIH5TY3JpcHREZWJ1Z1NlcnZlcigpOwogCiAgICAgdmlydHVhbCBMaXN0ZW5lclNl dCYgZ2V0TGlzdGVuZXJzKCkgPSAwOwpAQCAtMTE3LDQgKzExOCw0IEBAIHByaXZhdGU6CiAKIH0g Ly8gbmFtZXNwYWNlIEluc3BlY3RvcgogCi0jZW5kaWYgLy8gU2NyaXB0RGVidWdTZXJ2ZXJfaAor I2VuZGlmIC8vIFNjcmlwdERlYnVnU2VyKmVyX2gKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4 ODc5MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDE1LTA4LTIxICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+ CisKKyAgICAgICAgRGVidWdnZXIncyBWTSBzaG91bGQgbmV2ZXIgYmUgbnVsbAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4MzQxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgZG9lc24ndCBtYWtlIHNl bnNlIGZvciBhIERlYnVnZ2VyJ3MgVk0gdG8gYmUgbnVsbCwgYW5kIGNvZGUgcmVsYXRlZAorICAg ICAgICB0byBtYWludGFpbmluZyB0aGF0IGlsbHVzaW9uIGp1c3QgY2F1c2VkIHRoZSBXZWIgSW5z cGVjdG9yIHRvIGNyYXNoIG9uCisgICAgICAgIGxhdW5jaCAoaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0ODMxMikuIFNvLCBsZXQncyBzdG9wCisgICAgICAgIGRvaW5n IHRoYXQuCisKKyAgICAgICAgTm93LCBEZWJ1Z2dlciByZXF1aXJlcyBpdHMgc3ViY2xhc3MgdG8g cHJvdmlkZSBhIG5ldmVyLW51bGwgVk0mLgorCisgICAgICAgICogYmluZGluZ3MvanMvV29ya2Vy U2NyaXB0RGVidWdTZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyU2NyaXB0RGVi dWdTZXJ2ZXI6OldvcmtlclNjcmlwdERlYnVnU2VydmVyKToKKyAgICAgICAgKFdlYkNvcmU6Oldv cmtlclNjcmlwdERlYnVnU2VydmVyOjpyZWNvbXBpbGVBbGxKU0Z1bmN0aW9ucyk6CisgICAgICAg IChXZWJDb3JlOjpXb3JrZXJTY3JpcHREZWJ1Z1NlcnZlcjo6cnVuRXZlbnRMb29wV2hpbGVQYXVz ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9QYWdlU2NyaXB0RGVidWdTZXJ2ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UGFnZVNjcmlwdERlYnVnU2VydmVyOjpyZWNvbXBpbGVBbGxKU0Z1bmN0 aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlU2NyaXB0RGVidWdTZXJ2ZXI6OmRpZFBhdXNl KToKKwogMjAxNS0wOC0yMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIFN0b3AgdXNpbmcgdGhlIG9sZCBjYWxsT25NYWluVGhyZWFkIHZhcmlhbnQgb24g V2luZG93cwpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0RGVi dWdTZXJ2ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1dv cmtlclNjcmlwdERlYnVnU2VydmVyLmNwcAkocmV2aXNpb24gMTg4NzkxKQorKysgU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00NSw3ICs0NSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBJbnNwZWN0b3I7CiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIFdvcmtlclNjcmlwdERlYnVnU2VydmVyOjpXb3JrZXJTY3JpcHREZWJ1 Z1NlcnZlcihXb3JrZXJHbG9iYWxTY29wZSogY29udGV4dCwgY29uc3QgU3RyaW5nJiBtb2RlKQot ICAgIDogU2NyaXB0RGVidWdTZXJ2ZXIodHJ1ZSkKKyAgICA6IFNjcmlwdERlYnVnU2VydmVyKGNv bnRleHQtPnNjcmlwdCgpLT52bSgpLCB0cnVlKQogICAgICwgbV93b3JrZXJHbG9iYWxTY29wZShj b250ZXh0KQogICAgICwgbV9kZWJ1Z2dlclRhc2tNb2RlKG1vZGUpCiB7CkBAIC04NSw3ICs4NSw3 IEBAIHZvaWQgV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXI6OnJlY29tcGlsZUEKICAgICBKU0M6OlZN JiB2bSA9IG1fd29ya2VyR2xvYmFsU2NvcGUtPnNjcmlwdCgpLT52bSgpOwogCiAgICAgSlNDOjpK U0xvY2tIb2xkZXIgbG9jayh2bSk7Ci0gICAgSlNDOjpEZWJ1Z2dlcjo6cmVjb21waWxlQWxsSlNG dW5jdGlvbnMoJnZtKTsKKyAgICBKU0M6OkRlYnVnZ2VyOjpyZWNvbXBpbGVBbGxKU0Z1bmN0aW9u cygpOwogfQogCiB2b2lkIFdvcmtlclNjcmlwdERlYnVnU2VydmVyOjpydW5FdmVudExvb3BXaGls ZVBhdXNlZCgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvUGFnZVNjcmlwdERlYnVn U2VydmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvUGFnZVNj cmlwdERlYnVnU2VydmVyLmNwcAkocmV2aXNpb24gMTg4NzkxKQorKysgU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL1BhZ2VTY3JpcHREZWJ1Z1NlcnZlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg4 LDcgKzg4LDcgQEAgdm9pZCBQYWdlU2NyaXB0RGVidWdTZXJ2ZXI6OnJlbW92ZUxpc3Rlbgogdm9p ZCBQYWdlU2NyaXB0RGVidWdTZXJ2ZXI6OnJlY29tcGlsZUFsbEpTRnVuY3Rpb25zKCkKIHsKICAg ICBKU0xvY2tIb2xkZXIgbG9jayhKU0RPTVdpbmRvdzo6Y29tbW9uVk0oKSk7Ci0gICAgRGVidWdn ZXI6OnJlY29tcGlsZUFsbEpTRnVuY3Rpb25zKCZKU0RPTVdpbmRvdzo6Y29tbW9uVk0oKSk7Cisg ICAgRGVidWdnZXI6OnJlY29tcGlsZUFsbEpTRnVuY3Rpb25zKCk7CiB9CiAKIHZvaWQgUGFnZVNj cmlwdERlYnVnU2VydmVyOjpkaWRQYXVzZShKU0dsb2JhbE9iamVjdCopCg==