32442 2009-12-11 12:18:20 -0800 REGRESSION (r46972): Inspector console outputs the global value for a variable instead of the local value 2010-03-28 04:42:32 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED HasReduction, InRadar, Regression P2 Normal --- 28078 1 ddkilzer webkit-unassigned commit-queue ggaren joepeck mjs oliver pfeldman socket.h spamfaenger oldest_to_newest 170870 0 44701 ddkilzer 2009-12-11 12:18:20 -0800 Created attachment 44701 Test case * SUMMARY When breaking inside a function with a local variable that masks a global variable, printing the variable shows the globally-scoped variable instead of the locally-scoped one. * STEPS TO REPRODUCE 1. Launch Safari or WebKit nightly. 2. Enable JavaScript Debugging in the Web Inspector. 3. Load the test page. 4. Type 'x' in the console and hit Enter. * EXPECTED RESULTS The console should print: "This is the local value" * ACTUAL RESULTS This console prints: "This is the global value" * REGRESSION This is a regression from shipping Safari 4.0.4. 170885 1 ddkilzer 2009-12-11 12:57:14 -0800 The bisect-builds script reports: Works: r47686 Fails: r48034 Breakpoints don't seem to work in the Inspector between r47686-r48004, so I couldn't narrow it down in that range. 170888 2 ddkilzer 2009-12-11 13:00:38 -0800 CC-ing some Web Inspector developers. 174975 3 sam 2009-12-26 17:35:30 -0800 *** Bug 32513 has been marked as a duplicate of this bug. *** 184649 4 ddkilzer 2010-01-26 11:23:35 -0800 This appears to be a JavaScriptCore bug, not a Web Inspector bug, since it doesn't reproduce on Google Chrome for Mac 4.0.249.49. Still occurs with WebKit nightly build r53845. 186512 5 oliver 2010-02-01 12:17:08 -0800 No longer reproduces in the current nightly 186559 6 ddkilzer 2010-02-01 13:51:41 -0800 (In reply to comment #5) > No longer reproduces in the current nightly I still see "This is the global value" (which is the broken behavior) with WebKit nightly r54122. Which nightly are you using, Oliver? 186560 7 ddkilzer 2010-02-01 13:53:02 -0800 <rdar://problem/7464737> 186562 8 oliver 2010-02-01 13:54:57 -0800 (In reply to comment #6) > (In reply to comment #5) > > No longer reproduces in the current nightly > > I still see "This is the global value" (which is the broken behavior) with > WebKit nightly r54122. > > Which nightly are you using, Oliver? Wrong bug sorry :-( 193660 9 spamfaenger 2010-02-25 02:31:39 -0800 Any progress here? I just spent another day hunting a bug in the wrong direction because of this. :/ Is there any help that you need? (Another testcase reduction perhpas?) 205061 10 51845 socket.h 2010-03-27 15:56:04 -0700 Created attachment 51845 Proposed fix v1.0 205064 11 51845 pfeldman 2010-03-27 16:07:51 -0700 Comment on attachment 51845 Proposed fix v1.0 Looks great! One nit and we can land this! > + if (!dontUseCommandLineAPI) { > + expression = "with (window.console._inspectorCommandLineAPI) { with (window) {\n" + expression + "\n} }"; > + } Single-line conditions should not have {}. 205065 12 51846 socket.h 2010-03-27 16:12:21 -0700 Created attachment 51846 Proposed fix v1.1 205087 13 51846 commit-queue 2010-03-27 19:32:56 -0700 Comment on attachment 51846 Proposed fix v1.1 Clearing flags on attachment: 51846 Committed r56676: <http://trac.webkit.org/changeset/56676> 205088 14 commit-queue 2010-03-27 19:33:01 -0700 All reviewed patches have been landed. Closing bug. 205140 15 51846 ddkilzer 2010-03-28 03:51:02 -0700 Comment on attachment 51846 Proposed fix v1.1 >+ Fix the regression caused by r28078: a global variable >+ definition masks a local one in an inspector console >+ https://bugs.webkit.org/show_bug.cgi?id=32442 r28078 doesn't seem to the be revision that caused the regression. <http://trac.webkit.org/changeset/28078> 205143 16 ddkilzer 2010-03-28 04:06:23 -0700 (In reply to comment #15) > (From update of attachment 51846 [details]) > >+ Fix the regression caused by r28078: a global variable > >+ definition masks a local one in an inspector console > >+ https://bugs.webkit.org/show_bug.cgi?id=32442 > > r28078 doesn't seem to the be revision that caused the regression. > <http://trac.webkit.org/changeset/28078> Ah, I think you mean Bug 28078 which was fixed by r46972. <http://trac.webkit.org/changeset/46972> 205145 17 ddkilzer 2010-03-28 04:18:05 -0700 Nice job on the fix, Dmitry! Is it possible to write a LayoutTests/inspector test for this so it doesn't happen again? 205152 18 pfeldman 2010-03-28 04:42:32 -0700 (In reply to comment #17) > Nice job on the fix, Dmitry! > > Is it possible to write a LayoutTests/inspector test for this so it doesn't > happen again? Technically, it is possible. However, we don't yet have layout tests that stop in debugger, so various problems are likely to arise. Scenario for the test would be: - In the layout test page, create a function that has debugger; statement. That's pretty much all you do on the layout page side, rest is happening on the inspector front-end. - On the front-end side, enable debugger (this is done synchronously) and execute the function you created in previous step using InjectedScriptAccess.evaluate. - Just before you do this evaluate, add a sniffer that would give your code control upon WebInspector.pausedScript call from the backend. - As soon as pausedScript is called, get a reference to the call frame. - Either synchronously or in setTimeout(0) execute InjectedScriptAccess.evaluateInCallFrame against your call frame with "x" expression. tests are located under LayoutTests/inspector 44701 2009-12-11 12:18:20 -0800 2009-12-11 12:18:20 -0800 Test case Inspector console bug test.html text/html 777 ddkilzer PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIgogICAiaHR0 cDovL3d3dy53My5vcmcvVFIvaHRtbDQvc3RyaWN0LmR0ZCI+Cgo8aHRtbCBsYW5nPSJlbiI+Cjxo ZWFkPgoJPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7 IGNoYXJzZXQ9dXRmLTgiPgoJPHRpdGxlPkluc3BlY3RvciBDb25zb2xlIGJ1ZyB0ZXN0PC90aXRs ZT4KCQo8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+Cgp3aW5kb3cueCA9ICJUaGlzIGlz IHRoZSBnbG9iYWwgdmFsdWUiOwoKZnVuY3Rpb24gdGVzdEZ1bmN0aW9uKCkgewogIHZhciB4ID0g IlRoaXMgaXMgdGhlIGxvY2FsIHZhbHVlIjsKICBjb25zb2xlLmxvZygnVHlwZSAieCIgaW50byB0 aGUgY29uc29sZSB3aGlsZSBzdG9wcGVkIGluc2lkZSB0ZXN0RnVuY3Rpb24oKSB0byBzZWUgdGhl IGJ1ZyDigJQgaWYgaXQgc2hvd3MgdGhlIGdsb2JhbCB2YWx1ZSByYXRoZXIgdGhhbiB0aGUgbG9j YWwgdmFsdWUsIHRoYXTigJlzIHRoZSBidWcuJyk7CiAgCiAgZGVidWdnZXI7Cn0KCnRlc3RGdW5j dGlvbigpOwoKPC9zY3JpcHQ+CgkKPC9oZWFkPgo8Ym9keT4KClRvIHNlZSB0aGUgYnVnLCBlbmFi bGUgSmF2YVNjcmlwdCBEZWJ1Z2dpbmcgaW5zaWRlIHRoZSBXZWIgSW5zcGVjdG9yIGFuZApyZWxv YWQuICBUaGUgJ2RlYnVnZ2VyJyBzdGF0ZW1lbnQgc2hvdWxkIHRha2UgZWZmZWN0LCBhbmQgeW91 4oCZbGwgc2VlIHRoZSBidWcuCgo8L2JvZHk+CjwvaHRtbD4K 51845 2010-03-27 15:56:04 -0700 2010-03-27 16:12:21 -0700 Proposed fix v1.0 mypatch text/plain 3586 socket.h SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NjY3MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTAtMDMtMjcgIERtaXRyeSBHb3JiaWsgIDxzb2NrZXQuaEBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Rml4IHRoZSByZWdyZXNzaW9uIGNhdXNlZCBieSByMjgwNzg6IGEgZ2xvYmFsIHZhcmlhYmxlCisg ICAgICAgIGRlZmluaXRpb24gbWFza3MgYSBsb2NhbCBvbmUgaW4gYW4gaW5zcGVjdG9yIGNvbnNv bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyNDQy CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzOgorICAg ICAgICAoaW5qZWN0ZWRTY3JpcHRDb25zdHJ1Y3Rvcik6CisKIDIwMTAtMDMtMjYgIEpvc2VwaCBQ ZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZl bCBGZWxkbWFuLgpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2Ny aXB0LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3Rl ZFNjcmlwdC5qcwkocmV2aXNpb24gNTY0NDEpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5qZWN0ZWRTY3JpcHQuanMJKHdvcmtpbmcgY29weSkKQEAgLTIzMCw3ICsyMzAsNyBAQCBJ bmplY3RlZFNjcmlwdC5nZXRDb21wbGV0aW9ucyA9IGZ1bmN0aW9uCiAgICAgICAgICAgICBpZiAo IWNhbGxGcmFtZSkKICAgICAgICAgICAgICAgICByZXR1cm4gcHJvcHM7CiAgICAgICAgICAgICBp ZiAoZXhwcmVzc2lvbikKLSAgICAgICAgICAgICAgICBleHByZXNzaW9uUmVzdWx0ID0gSW5qZWN0 ZWRTY3JpcHQuX2V2YWx1YXRlT24oY2FsbEZyYW1lLmV2YWx1YXRlLCBjYWxsRnJhbWUsIGV4cHJl c3Npb24pOworICAgICAgICAgICAgICAgIGV4cHJlc3Npb25SZXN1bHQgPSBJbmplY3RlZFNjcmlw dC5fZXZhbHVhdGVPbihjYWxsRnJhbWUuZXZhbHVhdGUsIGNhbGxGcmFtZSwgZXhwcmVzc2lvbiwg dHJ1ZSk7CiAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAvLyBFdmFsdWF0ZSBp bnRvIHByb3BlcnRpZXMgaW4gc2NvcGUgb2YgdGhlIHNlbGVjdGVkIGNhbGwgZnJhbWUuCiAgICAg ICAgICAgICAgICAgdmFyIHNjb3BlQ2hhaW4gPSBjYWxsRnJhbWUuc2NvcGVDaGFpbjsKQEAgLTI1 OCwxMSArMjU4LDExIEBAIEluamVjdGVkU2NyaXB0LmV2YWx1YXRlID0gZnVuY3Rpb24oZXhwcmUK ICAgICByZXR1cm4gSW5qZWN0ZWRTY3JpcHQuX2V2YWx1YXRlQW5kV3JhcChJbmplY3RlZFNjcmlw dC5fd2luZG93KCkuZXZhbCwgSW5qZWN0ZWRTY3JpcHQuX3dpbmRvdygpLCBleHByZXNzaW9uLCBv YmplY3RHcm91cCk7CiB9CiAKLUluamVjdGVkU2NyaXB0Ll9ldmFsdWF0ZUFuZFdyYXAgPSBmdW5j dGlvbihldmFsRnVuY3Rpb24sIG9iamVjdCwgZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXApCitJbmpl Y3RlZFNjcmlwdC5fZXZhbHVhdGVBbmRXcmFwID0gZnVuY3Rpb24oZXZhbEZ1bmN0aW9uLCBvYmpl Y3QsIGV4cHJlc3Npb24sIG9iamVjdEdyb3VwLCBkb250VXNlQ29tbWFuZExpbmVBUEkpCiB7CiAg ICAgdmFyIHJlc3VsdCA9IHt9OwogICAgIHRyeSB7Ci0gICAgICAgIHJlc3VsdC52YWx1ZSA9IElu amVjdGVkU2NyaXB0LndyYXBPYmplY3QoSW5qZWN0ZWRTY3JpcHQuX2V2YWx1YXRlT24oZXZhbEZ1 bmN0aW9uLCBvYmplY3QsIGV4cHJlc3Npb24pLCBvYmplY3RHcm91cCk7CisgICAgICAgIHJlc3Vs dC52YWx1ZSA9IEluamVjdGVkU2NyaXB0LndyYXBPYmplY3QoSW5qZWN0ZWRTY3JpcHQuX2V2YWx1 YXRlT24oZXZhbEZ1bmN0aW9uLCBvYmplY3QsIGV4cHJlc3Npb24sIGRvbnRVc2VDb21tYW5kTGlu ZUFQSSksIG9iamVjdEdyb3VwKTsKIAogICAgICAgICAvLyBIYW5kbGUgZXJyb3IgdGhhdCBtaWdo dCBoYXZlIGhhcHBlbmVkIHdoaWxlIGRlc2NyaWJpbmcgcmVzdWx0LgogICAgICAgICBpZiAocmVz dWx0LnZhbHVlLmVycm9yVGV4dCkgewpAQCAtMjc2LDEyICsyNzYsMTQgQEAgSW5qZWN0ZWRTY3Jp cHQuX2V2YWx1YXRlQW5kV3JhcCA9IGZ1bmN0aQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLUlu amVjdGVkU2NyaXB0Ll9ldmFsdWF0ZU9uID0gZnVuY3Rpb24oZXZhbEZ1bmN0aW9uLCBvYmplY3Qs IGV4cHJlc3Npb24pCitJbmplY3RlZFNjcmlwdC5fZXZhbHVhdGVPbiA9IGZ1bmN0aW9uKGV2YWxG dW5jdGlvbiwgb2JqZWN0LCBleHByZXNzaW9uLCBkb250VXNlQ29tbWFuZExpbmVBUEkpCiB7CiAg ICAgSW5qZWN0ZWRTY3JpcHQuX2Vuc3VyZUNvbW1hbmRMaW5lQVBJSW5zdGFsbGVkKGV2YWxGdW5j dGlvbiwgb2JqZWN0KTsKICAgICAvLyBTdXJyb3VuZCB0aGUgZXhwcmVzc2lvbiBpbiB3aXRoIHN0 YXRlbWVudHMgdG8gaW5qZWN0IG91ciBjb21tYW5kIGxpbmUgQVBJIHNvIHRoYXQKICAgICAvLyB0 aGUgd2luZG93IG9iamVjdCBwcm9wZXJ0aWVzIHN0aWxsIHRha2UgbW9yZSBwcmVjZWRlbnQgdGhh biBvdXIgQVBJIGZ1bmN0aW9ucy4KLSAgICBleHByZXNzaW9uID0gIndpdGggKHdpbmRvdy5jb25z b2xlLl9pbnNwZWN0b3JDb21tYW5kTGluZUFQSSkgeyB3aXRoICh3aW5kb3cpIHtcbiIgKyBleHBy ZXNzaW9uICsgIlxufSB9IjsKKyAgICBpZiAoIWRvbnRVc2VDb21tYW5kTGluZUFQSSkgeworICAg ICAgICBleHByZXNzaW9uID0gIndpdGggKHdpbmRvdy5jb25zb2xlLl9pbnNwZWN0b3JDb21tYW5k TGluZUFQSSkgeyB3aXRoICh3aW5kb3cpIHtcbiIgKyBleHByZXNzaW9uICsgIlxufSB9IjsKKyAg ICB9CiAgICAgdmFyIHZhbHVlID0gZXZhbEZ1bmN0aW9uLmNhbGwob2JqZWN0LCBleHByZXNzaW9u KTsKIAogICAgIC8vIFdoZW4gZXZhbHVhdGluZyBvbiBjYWxsIGZyYW1lIGVycm9yIGlzIG5vdCB0 aHJvd24sIGJ1dCByZXR1cm5lZCBhcyBhIHZhbHVlLgpAQCAtNTc5LDcgKzU4MSw3IEBAIEluamVj dGVkU2NyaXB0LmV2YWx1YXRlSW5DYWxsRnJhbWUgPSBmdW4KICAgICB2YXIgY2FsbEZyYW1lID0g SW5qZWN0ZWRTY3JpcHQuX2NhbGxGcmFtZUZvcklkKGNhbGxGcmFtZUlkKTsKICAgICBpZiAoIWNh bGxGcmFtZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJldHVybiBJbmplY3RlZFNjcmlw dC5fZXZhbHVhdGVBbmRXcmFwKGNhbGxGcmFtZS5ldmFsdWF0ZSwgY2FsbEZyYW1lLCBjb2RlLCBv YmplY3RHcm91cCk7CisgICAgcmV0dXJuIEluamVjdGVkU2NyaXB0Ll9ldmFsdWF0ZUFuZFdyYXAo Y2FsbEZyYW1lLmV2YWx1YXRlLCBjYWxsRnJhbWUsIGNvZGUsIG9iamVjdEdyb3VwLCB0cnVlKTsK IH0KIAogSW5qZWN0ZWRTY3JpcHQuX2NhbGxGcmFtZUZvcklkID0gZnVuY3Rpb24oaWQpCg== 51846 2010-03-27 16:12:21 -0700 2010-03-28 03:51:02 -0700 Proposed fix v1.1 mypatch text/plain 3579 socket.h SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NjY3MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTAtMDMtMjcgIERtaXRyeSBHb3JiaWsgIDxzb2NrZXQuaEBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Rml4IHRoZSByZWdyZXNzaW9uIGNhdXNlZCBieSByMjgwNzg6IGEgZ2xvYmFsIHZhcmlhYmxlCisg ICAgICAgIGRlZmluaXRpb24gbWFza3MgYSBsb2NhbCBvbmUgaW4gYW4gaW5zcGVjdG9yIGNvbnNv bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyNDQy CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzOgorICAg ICAgICAoaW5qZWN0ZWRTY3JpcHRDb25zdHJ1Y3Rvcik6CisKIDIwMTAtMDMtMjYgIEpvc2VwaCBQ ZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZl bCBGZWxkbWFuLgpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2Ny aXB0LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3Rl ZFNjcmlwdC5qcwkocmV2aXNpb24gNTY0NDEpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5qZWN0ZWRTY3JpcHQuanMJKHdvcmtpbmcgY29weSkKQEAgLTIzMCw3ICsyMzAsNyBAQCBJ bmplY3RlZFNjcmlwdC5nZXRDb21wbGV0aW9ucyA9IGZ1bmN0aW9uCiAgICAgICAgICAgICBpZiAo IWNhbGxGcmFtZSkKICAgICAgICAgICAgICAgICByZXR1cm4gcHJvcHM7CiAgICAgICAgICAgICBp ZiAoZXhwcmVzc2lvbikKLSAgICAgICAgICAgICAgICBleHByZXNzaW9uUmVzdWx0ID0gSW5qZWN0 ZWRTY3JpcHQuX2V2YWx1YXRlT24oY2FsbEZyYW1lLmV2YWx1YXRlLCBjYWxsRnJhbWUsIGV4cHJl c3Npb24pOworICAgICAgICAgICAgICAgIGV4cHJlc3Npb25SZXN1bHQgPSBJbmplY3RlZFNjcmlw dC5fZXZhbHVhdGVPbihjYWxsRnJhbWUuZXZhbHVhdGUsIGNhbGxGcmFtZSwgZXhwcmVzc2lvbiwg dHJ1ZSk7CiAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAvLyBFdmFsdWF0ZSBp bnRvIHByb3BlcnRpZXMgaW4gc2NvcGUgb2YgdGhlIHNlbGVjdGVkIGNhbGwgZnJhbWUuCiAgICAg ICAgICAgICAgICAgdmFyIHNjb3BlQ2hhaW4gPSBjYWxsRnJhbWUuc2NvcGVDaGFpbjsKQEAgLTI1 OCwxMSArMjU4LDExIEBAIEluamVjdGVkU2NyaXB0LmV2YWx1YXRlID0gZnVuY3Rpb24oZXhwcmUK ICAgICByZXR1cm4gSW5qZWN0ZWRTY3JpcHQuX2V2YWx1YXRlQW5kV3JhcChJbmplY3RlZFNjcmlw dC5fd2luZG93KCkuZXZhbCwgSW5qZWN0ZWRTY3JpcHQuX3dpbmRvdygpLCBleHByZXNzaW9uLCBv YmplY3RHcm91cCk7CiB9CiAKLUluamVjdGVkU2NyaXB0Ll9ldmFsdWF0ZUFuZFdyYXAgPSBmdW5j dGlvbihldmFsRnVuY3Rpb24sIG9iamVjdCwgZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXApCitJbmpl Y3RlZFNjcmlwdC5fZXZhbHVhdGVBbmRXcmFwID0gZnVuY3Rpb24oZXZhbEZ1bmN0aW9uLCBvYmpl Y3QsIGV4cHJlc3Npb24sIG9iamVjdEdyb3VwLCBkb250VXNlQ29tbWFuZExpbmVBUEkpCiB7CiAg ICAgdmFyIHJlc3VsdCA9IHt9OwogICAgIHRyeSB7Ci0gICAgICAgIHJlc3VsdC52YWx1ZSA9IElu amVjdGVkU2NyaXB0LndyYXBPYmplY3QoSW5qZWN0ZWRTY3JpcHQuX2V2YWx1YXRlT24oZXZhbEZ1 bmN0aW9uLCBvYmplY3QsIGV4cHJlc3Npb24pLCBvYmplY3RHcm91cCk7CisgICAgICAgIHJlc3Vs dC52YWx1ZSA9IEluamVjdGVkU2NyaXB0LndyYXBPYmplY3QoSW5qZWN0ZWRTY3JpcHQuX2V2YWx1 YXRlT24oZXZhbEZ1bmN0aW9uLCBvYmplY3QsIGV4cHJlc3Npb24sIGRvbnRVc2VDb21tYW5kTGlu ZUFQSSksIG9iamVjdEdyb3VwKTsKIAogICAgICAgICAvLyBIYW5kbGUgZXJyb3IgdGhhdCBtaWdo dCBoYXZlIGhhcHBlbmVkIHdoaWxlIGRlc2NyaWJpbmcgcmVzdWx0LgogICAgICAgICBpZiAocmVz dWx0LnZhbHVlLmVycm9yVGV4dCkgewpAQCAtMjc2LDEyICsyNzYsMTQgQEAgSW5qZWN0ZWRTY3Jp cHQuX2V2YWx1YXRlQW5kV3JhcCA9IGZ1bmN0aQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLUlu amVjdGVkU2NyaXB0Ll9ldmFsdWF0ZU9uID0gZnVuY3Rpb24oZXZhbEZ1bmN0aW9uLCBvYmplY3Qs IGV4cHJlc3Npb24pCitJbmplY3RlZFNjcmlwdC5fZXZhbHVhdGVPbiA9IGZ1bmN0aW9uKGV2YWxG dW5jdGlvbiwgb2JqZWN0LCBleHByZXNzaW9uLCBkb250VXNlQ29tbWFuZExpbmVBUEkpCiB7CiAg ICAgSW5qZWN0ZWRTY3JpcHQuX2Vuc3VyZUNvbW1hbmRMaW5lQVBJSW5zdGFsbGVkKGV2YWxGdW5j dGlvbiwgb2JqZWN0KTsKICAgICAvLyBTdXJyb3VuZCB0aGUgZXhwcmVzc2lvbiBpbiB3aXRoIHN0 YXRlbWVudHMgdG8gaW5qZWN0IG91ciBjb21tYW5kIGxpbmUgQVBJIHNvIHRoYXQKICAgICAvLyB0 aGUgd2luZG93IG9iamVjdCBwcm9wZXJ0aWVzIHN0aWxsIHRha2UgbW9yZSBwcmVjZWRlbnQgdGhh biBvdXIgQVBJIGZ1bmN0aW9ucy4KLSAgICBleHByZXNzaW9uID0gIndpdGggKHdpbmRvdy5jb25z b2xlLl9pbnNwZWN0b3JDb21tYW5kTGluZUFQSSkgeyB3aXRoICh3aW5kb3cpIHtcbiIgKyBleHBy ZXNzaW9uICsgIlxufSB9IjsKKyAgICBpZiAoIWRvbnRVc2VDb21tYW5kTGluZUFQSSkKKyAgICAg ICAgZXhwcmVzc2lvbiA9ICJ3aXRoICh3aW5kb3cuY29uc29sZS5faW5zcGVjdG9yQ29tbWFuZExp bmVBUEkpIHsgd2l0aCAod2luZG93KSB7XG4iICsgZXhwcmVzc2lvbiArICJcbn0gfSI7CisKICAg ICB2YXIgdmFsdWUgPSBldmFsRnVuY3Rpb24uY2FsbChvYmplY3QsIGV4cHJlc3Npb24pOwogCiAg ICAgLy8gV2hlbiBldmFsdWF0aW5nIG9uIGNhbGwgZnJhbWUgZXJyb3IgaXMgbm90IHRocm93biwg YnV0IHJldHVybmVkIGFzIGEgdmFsdWUuCkBAIC01NzksNyArNTgxLDcgQEAgSW5qZWN0ZWRTY3Jp cHQuZXZhbHVhdGVJbkNhbGxGcmFtZSA9IGZ1bgogICAgIHZhciBjYWxsRnJhbWUgPSBJbmplY3Rl ZFNjcmlwdC5fY2FsbEZyYW1lRm9ySWQoY2FsbEZyYW1lSWQpOwogICAgIGlmICghY2FsbEZyYW1l KQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcmV0dXJuIEluamVjdGVkU2NyaXB0Ll9ldmFs dWF0ZUFuZFdyYXAoY2FsbEZyYW1lLmV2YWx1YXRlLCBjYWxsRnJhbWUsIGNvZGUsIG9iamVjdEdy b3VwKTsKKyAgICByZXR1cm4gSW5qZWN0ZWRTY3JpcHQuX2V2YWx1YXRlQW5kV3JhcChjYWxsRnJh bWUuZXZhbHVhdGUsIGNhbGxGcmFtZSwgY29kZSwgb2JqZWN0R3JvdXAsIHRydWUpOwogfQogCiBJ bmplY3RlZFNjcmlwdC5fY2FsbEZyYW1lRm9ySWQgPSBmdW5jdGlvbihpZCkK