139797 2014-12-18 16:20:24 -0800 Web Inspector: CRASH inspector-protocol/debugger/breakpoint-action-detach.html 2014-12-19 11:37:28 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck ap commit-queue graouts joepeck jonowells mark.lam mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1056939 0 joepeck 2014-12-18 16:20:24 -0800 * SUMMARY CRASH running inspector-protocol/debugger/breakpoint-action-detach.html with guard malloc. * STEPS TO REPRODUCE: 1. shell> run-webkit-tests inspector-protocol/debugger/breakpoint-action-detach.html --repeat-each 2 -v --no-retry -g => CRASH * CRASH Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.JavaScriptCore 0x000000010310bffc WTF::Vector<Inspector::ScriptBreakpointAction, 0ul, WTF::CrashOnOverflow>::size() const + 12 1 com.apple.JavaScriptCore 0x000000010347732c Inspector::ScriptDebugServer::handleBreakpointHit(JSC::Breakpoint const&) + 204 2 com.apple.JavaScriptCore 0x0000000102d18a96 JSC::Debugger::pauseIfNeeded(JSC::ExecState*) + 422 3 com.apple.JavaScriptCore 0x0000000102d18d6c JSC::Debugger::updateCallFrameAndPauseIfNeeded(JSC::ExecState*) + 60 4 com.apple.JavaScriptCore 0x0000000102d18f8c JSC::Debugger::returnEvent(JSC::ExecState*) + 76 5 com.apple.JavaScriptCore 0x0000000103177069 JSC::Interpreter::debug(JSC::ExecState*, JSC::DebugHookID) + 265 * NOTES - The test itself is closing the page in the 1st breakpoint action, and assumes the 2nd breakpoint action never fires: actions: [ {type: "evaluate", data: "disconnect()"}, {type: "evaluate", data: "log('FAIL: This action should not be executed.')"} ] - Iterating breakpoint actions we actually use a reference to a list in a hash, unfortunately that hash entry can go away. This is enough to fix the crash: BreakpointIDToActionsMap::iterator it = m_breakpointIDToActions.find(breakpoint.id); if (it != m_breakpointIDToActions.end()) { - BreakpointActions& actions = it->value; + BreakpointActions actions = it->value; for (size_t i = 0; i < actions.size(); ++i) { if (!evaluateBreakpointAction(actions[i])) return; } } but we need to do a bit more to ensure that later breakpoint actions don't still fire if the debugger was detached. 1056940 1 webkit-bug-importer 2014-12-18 16:21:05 -0800 <rdar://problem/19301619> 1056944 2 243531 joepeck 2014-12-18 16:25:19 -0800 Created attachment 243531 [PATCH] Proposed Fix All breakpoint action tests pass. Also played with breakpoint actions a bit manually to make sure multiple breakpoint actions behaved as expected. 1057060 3 243531 mark.lam 2014-12-19 10:33:51 -0800 Comment on attachment 243531 [PATCH] Proposed Fix r=me 1057110 4 243531 commit-queue 2014-12-19 11:37:24 -0800 Comment on attachment 243531 [PATCH] Proposed Fix Clearing flags on attachment: 243531 Committed r177585: <http://trac.webkit.org/changeset/177585> 1057111 5 commit-queue 2014-12-19 11:37:28 -0800 All reviewed patches have been landed. Closing bug. 243531 2014-12-18 16:25:19 -0800 2014-12-19 11:37:24 -0800 [PATCH] Proposed Fix breakpoint-action.patch text/plain 9231 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGIxMzM1ZDQuLmMxMjE2OGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTEyLTE4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ1JBU0gg aW5zcGVjdG9yLXByb3RvY29sL2RlYnVnZ2VyL2JyZWFrcG9pbnQtYWN0aW9uLWRldGFjaC5odG1s CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk3OTcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRlYnVn Z2VyL0RlYnVnZ2VyLmg6CisgICAgICAgICogZGVidWdnZXIvRGVidWdnZXIuY3BwOgorICAgICAg ICAoSlNDOjpEZWJ1Z2dlcjo6aXNBdHRhY2hlZCk6CisgICAgICAgIENoZWNrIGlmIHdlIGFyZSB0 aGUgZGVidWdnZXIgZm9yIGEgcGFydGljdWxhciBnbG9iYWwgb2JqZWN0LgorICAgICAgICAoSlND OjpEZWJ1Z2dlcjo6cGF1c2VJZk5lZWRlZCk6CisgICAgICAgIFBhc3MgdGhlIGdsb2JhbCBvYmpl Y3Qgb24gd2hlbiBoaXR0aW5nIGEgYnJla2Fwb2ludC4KKworICAgICAgICAqIGluc3BlY3Rvci9T Y3JpcHREZWJ1Z1NlcnZlci5oOgorICAgICAgICAqIGluc3BlY3Rvci9TY3JpcHREZWJ1Z1NlcnZl ci5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OlNjcmlwdERlYnVnU2VydmVyOjpoYW5kbGVCcmVh a3BvaW50SGl0KToKKyAgICAgICAgU3RvcCBldmFsdXRpbmcgYnJlYWtwb2ludCBhY3Rpb25zIGlm IGEgcHJldmlvdXMgYWN0aW9uIGNhdXNlZCB0aGUKKyAgICAgICAgZGVidWdnZXIgdG8gZGV0YWNo IGZyb20gdGhpcyBnbG9iYWwgb2JqZWN0LgorICAgICAgICAoSW5zcGVjdG9yOjpTY3JpcHREZWJ1 Z1NlcnZlcjo6aGFuZGxlUGF1c2UpOgorICAgICAgICBTdGFuZGFyZGl6ZSBvbiBwYXNzaW5nIEpT R2xvYmFsT2JqZWN0IHBhcmFtZXRlciBmaXJzdC4KKwogMjAxNC0xMi0xNyAgTWljaGFlbCBTYWJv ZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXN0cyB3aXRoIGluZmluaXRlIHJl Y3Vyc2lvbiBmcmVxdWVudGx5IGNyYXNoCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvZGVidWdnZXIvRGVidWdnZXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RlYnVnZ2Vy L0RlYnVnZ2VyLmNwcAppbmRleCA2YjJkZGE3Li42M2VjZDU2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlci5jcHAKQEAgLTIwNiw2ICsyMDYsMTEgQEAgdm9pZCBE ZWJ1Z2dlcjo6ZGV0YWNoKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFJlYXNvbkZvckRl dGFjaCByZWFzb24pCiAgICAgICAgIG1fdm0gPSBudWxscHRyOwogfQogCitib29sIERlYnVnZ2Vy Ojppc0F0dGFjaGVkKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QpCit7CisgICAgcmV0dXJu IGdsb2JhbE9iamVjdC0+ZGVidWdnZXIoKSA9PSB0aGlzOworfQorCiBjbGFzcyBEZWJ1Z2dlcjo6 U2V0U3RlcHBpbmdNb2RlRnVuY3RvciB7CiBwdWJsaWM6CiAgICAgU2V0U3RlcHBpbmdNb2RlRnVu Y3RvcihEZWJ1Z2dlciogZGVidWdnZXIsIFN0ZXBwaW5nTW9kZSBtb2RlKQpAQCAtNjYwLDE0ICs2 NjUsMTQgQEAgdm9pZCBEZWJ1Z2dlcjo6cGF1c2VJZk5lZWRlZChDYWxsRnJhbWUqIGNhbGxGcmFt ZSkKICAgICBtX3BhdXNlT25OZXh0U3RhdGVtZW50ID0gZmFsc2U7CiAKICAgICBpZiAoZGlkSGl0 QnJlYWtwb2ludCkgewotICAgICAgICBoYW5kbGVCcmVha3BvaW50SGl0KGJyZWFrcG9pbnQpOwor ICAgICAgICBoYW5kbGVCcmVha3BvaW50SGl0KHZtRW50cnlHbG9iYWxPYmplY3QsIGJyZWFrcG9p bnQpOwogICAgICAgICAvLyBOb3RlIHRoYXQgdGhlIGFjdGlvbnMgY2FuIHBvdGVudGlhbGx5IHN0 b3AgdGhlIGRlYnVnZ2VyLCBzbyB3ZSBuZWVkIHRvIGNoZWNrIHRoYXQKICAgICAgICAgLy8gd2Ug c3RpbGwgaGF2ZSBhIGN1cnJlbnQgY2FsbCBmcmFtZSB3aGVuIHdlIGdldCBiYWNrLgogICAgICAg ICBpZiAoYnJlYWtwb2ludC5hdXRvQ29udGludWUgfHwgIW1fY3VycmVudENhbGxGcmFtZSkKICAg ICAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBoYW5kbGVQYXVzZShtX3JlYXNvbkZvclBh dXNlLCB2bUVudHJ5R2xvYmFsT2JqZWN0KTsKKyAgICBoYW5kbGVQYXVzZSh2bUVudHJ5R2xvYmFs T2JqZWN0LCBtX3JlYXNvbkZvclBhdXNlKTsKIAogICAgIGlmICghbV9wYXVzZU9uTmV4dFN0YXRl bWVudCAmJiAhbV9wYXVzZU9uQ2FsbEZyYW1lKSB7CiAgICAgICAgIHNldFN0ZXBwaW5nTW9kZShT dGVwcGluZ01vZGVEaXNhYmxlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGVidWdnZXIvRGVidWdnZXIuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1 Z2dlci5oCmluZGV4IDc4N2I5M2EuLmQ5ZWE0NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZWJ1Z2dlci9EZWJ1Z2dlci5oCkBAIC02MCwxMiArNjAsMTMgQEAgcHVibGljOgogCiAgICAgYm9v bCBuZWVkc0V4Y2VwdGlvbkNhbGxiYWNrcygpIGNvbnN0IHsgcmV0dXJuIG1fcGF1c2VPbkV4Y2Vw dGlvbnNTdGF0ZSAhPSBEb250UGF1c2VPbkV4Y2VwdGlvbnM7IH0KIAotICAgIHZvaWQgYXR0YWNo KEpTR2xvYmFsT2JqZWN0Kik7CiAgICAgZW51bSBSZWFzb25Gb3JEZXRhY2ggewogICAgICAgICBU ZXJtaW5hdGluZ0RlYnVnZ2luZ1Nlc3Npb24sCiAgICAgICAgIEdsb2JhbE9iamVjdElzRGVzdHJ1 Y3RpbmcKICAgICB9OwotICAgIHZpcnR1YWwgdm9pZCBkZXRhY2goSlNHbG9iYWxPYmplY3QqLCBS ZWFzb25Gb3JEZXRhY2gpOworICAgIHZvaWQgYXR0YWNoKEpTR2xvYmFsT2JqZWN0Kik7CisgICAg dm9pZCBkZXRhY2goSlNHbG9iYWxPYmplY3QqLCBSZWFzb25Gb3JEZXRhY2gpOworICAgIGJvb2wg aXNBdHRhY2hlZChKU0dsb2JhbE9iamVjdCopOwogCiAgICAgQnJlYWtwb2ludElEIHNldEJyZWFr cG9pbnQoQnJlYWtwb2ludCwgdW5zaWduZWQmIGFjdHVhbExpbmUsIHVuc2lnbmVkJiBhY3R1YWxD b2x1bW4pOwogICAgIHZvaWQgcmVtb3ZlQnJlYWtwb2ludChCcmVha3BvaW50SUQpOwpAQCAtODks NyArOTAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdGVwT3ZlclN0YXRlbWVudCgpOwogICAgIHZv aWQgc3RlcE91dE9mRnVuY3Rpb24oKTsKIAotICAgIGJvb2wgaXNQYXVzZWQoKSB7IHJldHVybiBt X2lzUGF1c2VkOyB9CisgICAgYm9vbCBpc1BhdXNlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNQYXVz ZWQ7IH0KICAgICBib29sIGlzU3RlcHBpbmcoKSBjb25zdCB7IHJldHVybiBtX3N0ZXBwaW5nTW9k ZSA9PSBTdGVwcGluZ01vZGVFbmFibGVkOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgc291cmNlUGFy c2VkKEV4ZWNTdGF0ZSosIFNvdXJjZVByb3ZpZGVyKiwgaW50IGVycm9yTGluZU51bWJlciwgY29u c3QgV1RGOjpTdHJpbmcmIGVycm9yTWVzc2FnZSkgPSAwOwpAQCAtMTA4LDcgKzEwOSw3IEBAIHB1 YmxpYzoKIAogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgYm9vbCBuZWVkUGF1c2VIYW5kbGluZyhK U0dsb2JhbE9iamVjdCopIHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCB2b2lkIGhhbmRs ZUJyZWFrcG9pbnRIaXQoY29uc3QgQnJlYWtwb2ludCYpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBo YW5kbGVCcmVha3BvaW50SGl0KEpTR2xvYmFsT2JqZWN0KiwgY29uc3QgQnJlYWtwb2ludCYpIHsg fQogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVFeGNlcHRpb25JbkJyZWFrcG9pbnRDb25kaXRpb24o RXhlY1N0YXRlKiwgSlNWYWx1ZSBleGNlcHRpb24pIGNvbnN0IHsgVU5VU0VEX1BBUkFNKGV4Y2Vw dGlvbik7IH0KIAogICAgIGVudW0gUmVhc29uRm9yUGF1c2UgewpAQCAtMTI0LDcgKzEyNSw3IEBA IHByb3RlY3RlZDoKIAogICAgIFJlYXNvbkZvclBhdXNlIHJlYXNvbkZvclBhdXNlKCkgY29uc3Qg eyByZXR1cm4gbV9yZWFzb25Gb3JQYXVzZTsgfQogCi0gICAgdmlydHVhbCB2b2lkIGhhbmRsZVBh dXNlKFJlYXNvbkZvclBhdXNlLCBKU0dsb2JhbE9iamVjdCopIHsgfQorICAgIHZpcnR1YWwgdm9p ZCBoYW5kbGVQYXVzZShKU0dsb2JhbE9iamVjdCosIFJlYXNvbkZvclBhdXNlKSB7IH0KICAgICB2 aXJ0dWFsIHZvaWQgbm90aWZ5RG9uZVByb2Nlc3NpbmdEZWJ1Z2dlckV2ZW50cygpIHsgfQogCiBw cml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9TY3Jp cHREZWJ1Z1NlcnZlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL1Njcmlw dERlYnVnU2VydmVyLmNwcAppbmRleCA5N2M2Mzk1Li5kYjk0ZmFmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnU2VydmVyLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnU2VydmVyLmNwcApAQCAt Mjg2LDE1ICsyODYsMjAgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6bm90aWZ5RG9uZVByb2Nl c3NpbmdEZWJ1Z2dlckV2ZW50cygpCiAgICAgbV9kb25lUHJvY2Vzc2luZ0RlYnVnZ2VyRXZlbnRz ID0gdHJ1ZTsKIH0KIAotdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6aGFuZGxlQnJlYWtwb2ludEhp dChjb25zdCBKU0M6OkJyZWFrcG9pbnQmIGJyZWFrcG9pbnQpCit2b2lkIFNjcmlwdERlYnVnU2Vy dmVyOjpoYW5kbGVCcmVha3BvaW50SGl0KEpTQzo6SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVj dCwgY29uc3QgSlNDOjpCcmVha3BvaW50JiBicmVha3BvaW50KQogeworICAgIEFTU0VSVChpc0F0 dGFjaGVkKGdsb2JhbE9iamVjdCkpOworCiAgICAgbV9jdXJyZW50UHJvYmVCYXRjaElkKys7CisK ICAgICBCcmVha3BvaW50SURUb0FjdGlvbnNNYXA6Oml0ZXJhdG9yIGl0ID0gbV9icmVha3BvaW50 SURUb0FjdGlvbnMuZmluZChicmVha3BvaW50LmlkKTsKICAgICBpZiAoaXQgIT0gbV9icmVha3Bv aW50SURUb0FjdGlvbnMuZW5kKCkpIHsKLSAgICAgICAgQnJlYWtwb2ludEFjdGlvbnMmIGFjdGlv bnMgPSBpdC0+dmFsdWU7CisgICAgICAgIEJyZWFrcG9pbnRBY3Rpb25zIGFjdGlvbnMgPSBpdC0+ dmFsdWU7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYWN0aW9ucy5zaXplKCk7ICsr aSkgewogICAgICAgICAgICAgaWYgKCFldmFsdWF0ZUJyZWFrcG9pbnRBY3Rpb24oYWN0aW9uc1tp XSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgaWYgKCFpc0F0dGFjaGVk KGdsb2JhbE9iamVjdCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAg fQogfQpAQCAtMzA0LDcgKzMwOSw3IEBAIHZvaWQgU2NyaXB0RGVidWdTZXJ2ZXI6OmhhbmRsZUV4 Y2VwdGlvbkluQnJlYWtwb2ludENvbmRpdGlvbihKU0M6OkV4ZWNTdGF0ZSogZXhlCiAgICAgcmVw b3J0RXhjZXB0aW9uKGV4ZWMsIGV4Y2VwdGlvbik7CiB9CiAKLXZvaWQgU2NyaXB0RGVidWdTZXJ2 ZXI6OmhhbmRsZVBhdXNlKERlYnVnZ2VyOjpSZWFzb25Gb3JQYXVzZSwgSlNHbG9iYWxPYmplY3Qq IHZtRW50cnlHbG9iYWxPYmplY3QpCit2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpoYW5kbGVQYXVz ZShKU0dsb2JhbE9iamVjdCogdm1FbnRyeUdsb2JhbE9iamVjdCwgRGVidWdnZXI6OlJlYXNvbkZv clBhdXNlKQogewogICAgIGRpc3BhdGNoRnVuY3Rpb25Ub0xpc3RlbmVycygmU2NyaXB0RGVidWdT ZXJ2ZXI6OmRpc3BhdGNoRGlkUGF1c2UpOwogICAgIGRpZFBhdXNlKHZtRW50cnlHbG9iYWxPYmpl Y3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9TY3JpcHRE ZWJ1Z1NlcnZlci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1 Z1NlcnZlci5oCmluZGV4IGQ5ZjYzMzUuLjI5N2ViMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvU2NyaXB0RGVidWdTZXJ2ZXIuaAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnU2VydmVyLmgKQEAgLTEwMCw5ICsxMDAs OSBAQCBwcml2YXRlOgogCiAgICAgdmlydHVhbCB2b2lkIHNvdXJjZVBhcnNlZChKU0M6OkV4ZWNT dGF0ZSosIEpTQzo6U291cmNlUHJvdmlkZXIqLCBpbnQgZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcm IGVycm9yTXNnKSBvdmVycmlkZSBmaW5hbDsKICAgICB2aXJ0dWFsIGJvb2wgbmVlZFBhdXNlSGFu ZGxpbmcoSlNDOjpKU0dsb2JhbE9iamVjdCopIG92ZXJyaWRlIGZpbmFsIHsgcmV0dXJuIHRydWU7 IH0KLSAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlQnJlYWtwb2ludEhpdChjb25zdCBKU0M6OkJyZWFr cG9pbnQmKSBvdmVycmlkZSBmaW5hbDsKKyAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlQnJlYWtwb2lu dEhpdChKU0M6OkpTR2xvYmFsT2JqZWN0KiwgY29uc3QgSlNDOjpCcmVha3BvaW50Jikgb3ZlcnJp ZGUgZmluYWw7CiAgICAgdmlydHVhbCB2b2lkIGhhbmRsZUV4Y2VwdGlvbkluQnJlYWtwb2ludENv bmRpdGlvbihKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSBleGNlcHRpb24pIGNvbnN0IG92 ZXJyaWRlIGZpbmFsOwotICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVQYXVzZShKU0M6OkRlYnVnZ2Vy OjpSZWFzb25Gb3JQYXVzZSwgSlNDOjpKU0dsb2JhbE9iamVjdCopIG92ZXJyaWRlIGZpbmFsOwor ICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVQYXVzZShKU0M6OkpTR2xvYmFsT2JqZWN0KiwgSlNDOjpE ZWJ1Z2dlcjo6UmVhc29uRm9yUGF1c2UpIG92ZXJyaWRlIGZpbmFsOwogICAgIHZpcnR1YWwgdm9p ZCBub3RpZnlEb25lUHJvY2Vzc2luZ0RlYnVnZ2VyRXZlbnRzKCkgb3ZlcnJpZGUgZmluYWw7CiAK ICAgICBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSBleGNlcHRpb25PckNhdWdodFZhbHVlKEpTQzo6 RXhlY1N0YXRlKik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggNmIzM2U1Ni4uMzdjYmU1ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTEyLTE4ICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ1JBU0ggaW5z cGVjdG9yLXByb3RvY29sL2RlYnVnZ2VyL2JyZWFrcG9pbnQtYWN0aW9uLWRldGFjaC5odG1sCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk3OTcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcv V2ViU2NyaXB0RGVidWdnZXIuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlNjcmlwdERlYnVnZ2Vy Lm1tOgorICAgICAgICAoV2ViU2NyaXB0RGVidWdnZXI6OmhhbmRsZVBhdXNlKToKKyAgICAgICAg U3RhbmRhcmRpemUgb24gcGFzc2luZyBKU0dsb2JhbE9iamVjdCBwYXJhbWV0ZXIgZmlyc3QuCisK IDIwMTQtMTItMTcgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAg IFB1cmdlIFBhc3NSZWZQdHIgZnJvbSBGcmFtZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViU2NyaXB0RGVidWdnZXIuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViU2NyaXB0RGVidWdnZXIuaAppbmRleCBlMjNiMTNmLi5kOWM0NjY4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlNjcmlwdERlYnVnZ2VyLmgKKysrIGIvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJTY3JpcHREZWJ1Z2dlci5oCkBAIC01Niw3ICs1Niw3 IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgc291cmNlUGFyc2VkKEpT Qzo6RXhlY1N0YXRlKiwgSlNDOjpTb3VyY2VQcm92aWRlciosIGludCBlcnJvckxpbmUsIGNvbnN0 IFdURjo6U3RyaW5nJiBlcnJvck1zZykgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCB2b2lkIGhhbmRs ZVBhdXNlKEpTQzo6RGVidWdnZXI6OlJlYXNvbkZvclBhdXNlLCBKU0M6OkpTR2xvYmFsT2JqZWN0 Kikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGhhbmRsZVBhdXNlKEpTQzo6SlNHbG9iYWxP YmplY3QqLCBKU0M6OkRlYnVnZ2VyOjpSZWFzb25Gb3JQYXVzZSkgb3ZlcnJpZGU7CiAgICAgdmly dHVhbCBib29sIG5lZWRQYXVzZUhhbmRsaW5nKEpTQzo6SlNHbG9iYWxPYmplY3QqKSBvdmVycmlk ZSB7IHJldHVybiB0cnVlOyB9CiAKICAgICBib29sIG1fY2FsbGluZ0RlbGVnYXRlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJTY3JpcHREZWJ1Z2dlci5tbSBiL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViU2NyaXB0RGVidWdnZXIubW0KaW5kZXggYzBkZWVm OC4uNmQ1MjY1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJTY3Jp cHREZWJ1Z2dlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlNjcmlwdERl YnVnZ2VyLm1tCkBAIC0xMTgsNyArMTE4LDcgQEAgdm9pZCBXZWJTY3JpcHREZWJ1Z2dlcjo6c291 cmNlUGFyc2VkKEV4ZWNTdGF0ZSogZXhlYywgU291cmNlUHJvdmlkZXIqIHNvdXJjZVByb3YKICAg ICBtX2NhbGxpbmdEZWxlZ2F0ZSA9IGZhbHNlOwogfQogCi12b2lkIFdlYlNjcmlwdERlYnVnZ2Vy OjpoYW5kbGVQYXVzZShEZWJ1Z2dlcjo6UmVhc29uRm9yUGF1c2UgcmVhc29uLCBKU0dsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0KQordm9pZCBXZWJTY3JpcHREZWJ1Z2dlcjo6aGFuZGxlUGF1c2Uo SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgRGVidWdnZXI6OlJlYXNvbkZvclBhdXNlIHJl YXNvbikKIHsKICAgICBpZiAobV9jYWxsaW5nRGVsZWdhdGUpCiAgICAgICAgIHJldHVybjsK