234575 2021-12-21 14:11:02 -0800 Uncaught Exception: Cannot step over because debugger is not paused 2022-01-07 12:22:14 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED about:blank InRadar P2 Normal --- 1 bburg pangle bburg ews-watchlist hi inspector-bugzilla-changes pangle webkit-bug-importer oldest_to_newest 1826109 0 bburg 2021-12-21 14:11:02 -0800 Uncaught Exception in Web Inspector. Steps to Reproduce: 0. Using an engineering build, launch Safari 1. Go to about:blank 2. Use keyboard shortcuts for stepping, for example Command-' Uncaught Exceptions: ----------------------- - Cannot step over because debugger is not paused. (at DebuggerManager.js:597:44) stepOver @ DebuggerManager.js:597:44 ? @ Main.js:1558:32 _handleKeyDown @ KeyboardShortcut.js:82:42 ----------------------- Notes: Inspected URL: about:blank Loading completed: true Frontend User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) 1826110 1 webkit-bug-importer 2021-12-21 14:11:53 -0800 <rdar://problem/86783769> 1828770 2 448543 pangle 2022-01-06 16:00:18 -0800 Created attachment 448543 Patch v1.0 1828771 3 448543 hi 2022-01-06 16:09:39 -0800 Comment on attachment 448543 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=448543&action=review > Source/WebInspectorUI/UserInterface/Base/Main.js:1556 > + InspectorFrontendHost.beep(); I kinda feel like instead of beeping, maybe we should just disable the keyboard shortcut when not paused. Our documentation even says "When paused" <https://webkit.org/web-inspector/keyboard-shortcuts/#sources-tab> so I don't think it's that crazy of an idea. I'd probably look for where `WI.DebuggerManager.Event.Paused` and `WI.DebuggerManager.Event.Resumed` are dispatched and add `WI.stepOverKeyboardShortcut.disabled = !this.paused;` for each keyboard shortcut (and their alternates). NIT: if you do wanna keep this, I'd make this into an early return 1828780 4 448546 pangle 2022-01-06 16:46:25 -0800 Created attachment 448546 Patch v1.1 1828790 5 448546 hi 2022-01-06 17:51:41 -0800 Comment on attachment 448546 Patch v1.1 View in context: https://bugs.webkit.org/attachment.cgi?id=448546&action=review r=me with one thing to fix :) > Source/WebInspectorUI/UserInterface/Base/Main.js:1687 > + WI.stepOverKeyboardShortcut.disabled = !WI.debuggerManager.paused; NIT: Can we `let paused = WI.debuggerManager.paused;` to avoid the repeated logic? Alternatively, you could make `WI._updateDebuggerKeyboardShortcuts` take a parameter `paused` and hardcode the value at each callsite (e.g. we know that the debugger is not paused inside `WI._debuggerDidResume` so there's kinda no reason to re-check `WI.debuggerManager.paused`, tho it would be a nice `console.assert` just to be sure). > Source/WebInspectorUI/UserInterface/Base/Main.js:1690 > + WI.pauseOrResumeAlternateKeyboardShortcut.disabled = !WI.debuggerManager.paused; I dont think this should ever be disabled since it works both when and not paused. 1828820 6 448560 pangle 2022-01-06 21:33:01 -0800 Created attachment 448560 Patch v1.2 1829031 7 ews-feeder 2022-01-07 12:22:10 -0800 Committed r287776 (245836@main): <https://commits.webkit.org/245836@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 448560. 448543 2022-01-06 16:00:18 -0800 2022-01-06 16:46:23 -0800 Patch v1.0 bug-234575-20220106160017.patch text/plain 2486 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl NjhjZWQ4YWM0YWVkYTI0ZDZiYmJmZjRiOTc2NzI5Y2VjODc3N2U2Li4xODM0ZjA4OTZmYzZiY2Y1 ZDkzYjQ5MTFjNTNjYjMwMzE2MzM3NDNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAyMi0wMS0wNiAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgVW5jYXVnaHQgRXhjZXB0aW9uOiBDYW5ub3Qgc3RlcCBvdmVyIGJlY2F1c2Ug ZGVidWdnZXIgaXMgbm90IHBhdXNlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM0NTc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUHJldmlvdXNseSBrZXlib2FyZCBzaG9ydGN1dHMgZm9yIGFkdmFuY2lu ZyB0aGUgZGVidWdnZXIgZGlkIG5vdCBjaGVjayB0byBtYWtlIHN1cmUgdGhhdCB0aGUgZGVidWdn ZXIgd2FzCisgICAgICAgIGFjdHVhbGx5IHBhdXNlZCBiZWZvcmUgYXR0ZW1wdGluZyB0byBzdGVw LiBUaGlzIGxlZCB0byBhbiB1bmNhdWdodCBleGNlcHRpb24gYW5kIGluIHJlbGVhc2UgYnVpbGRz IHByb3ZpZGVkIG5vCisgICAgICAgIGZlZWRiYWNrIHRoYXQgdGhlIGFjdGlvbiB3YXMgdW5hdmFp bGFibGUgY3VycmVudGx5LiBXZSBub3cgY2hlY2sgaWYgd2UgYXJlIGN1cnJlbnQgcGF1c2VkIGJl Zm9yZSBhdHRlbXB0aW5nIHRvCisgICAgICAgIHBlcmZvcm0gYW55IHN0ZXAgYWN0aW9uIGluIHJl c3BvbnNlIHRvIGEga2V5IGNob3JkLCBhbmQgcHJvdmlkZSBmZWVkYmFjayBieSB3YXkgb2YgdGhl IHN5c3RlbSBiZWVwIGlmIHRoZSBhY3Rpb24KKyAgICAgICAgaXMgbm90IGN1cnJlbnRseSBhYmxl IHRvIGJlIHBlcmZvcm1lZCBiZWNhdXNlIHRoZSBkZWJ1Z2dlciB3YXNuJ3QgcGF1c2VkLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisKIDIwMjEtMTItMzEgIFRpbSBO Z3V5ZW4gIDxudGltQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBmaXggYXNz ZXJ0IHRleHQgaW4gR3JhZGllbnQuanMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCBjZTVjN2ZmMjM0MmUwMGRmYzU2OWIxODQ0MWI0 ZDcwMTA2Njc4YzJjLi43ZjZkMTI3YzU0ZmQzNDU4OTIyMzY3YzQ1MjQwYmEyZmQzNzExNjU3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4u anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpz CkBAIC0xNTUwLDIyICsxNTUwLDM0IEBAIFdJLmRlYnVnZ2VyUGF1c2VSZXN1bWVUb2dnbGUgPSBm dW5jdGlvbihldmVudCkKIAogV0kuZGVidWdnZXJTdGVwTmV4dCA9IGZ1bmN0aW9uKGV2ZW50KQog ewotICAgIFdJLmRlYnVnZ2VyTWFuYWdlci5zdGVwTmV4dCgpOworICAgIGlmIChXSS5kZWJ1Z2dl ck1hbmFnZXIucGF1c2VkKQorICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIuc3RlcE5leHQoKTsK KyAgICBlbHNlCisgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5iZWVwKCk7CiB9OwogCiBX SS5kZWJ1Z2dlclN0ZXBPdmVyID0gZnVuY3Rpb24oZXZlbnQpCiB7Ci0gICAgV0kuZGVidWdnZXJN YW5hZ2VyLnN0ZXBPdmVyKCk7CisgICAgaWYgKFdJLmRlYnVnZ2VyTWFuYWdlci5wYXVzZWQpCisg ICAgICAgIFdJLmRlYnVnZ2VyTWFuYWdlci5zdGVwT3ZlcigpOworICAgIGVsc2UKKyAgICAgICAg SW5zcGVjdG9yRnJvbnRlbmRIb3N0LmJlZXAoKTsKIH07CiAKIFdJLmRlYnVnZ2VyU3RlcEludG8g PSBmdW5jdGlvbihldmVudCkKIHsKLSAgICBXSS5kZWJ1Z2dlck1hbmFnZXIuc3RlcEludG8oKTsK KyAgICBpZiAoV0kuZGVidWdnZXJNYW5hZ2VyLnBhdXNlZCkKKyAgICAgICAgV0kuZGVidWdnZXJN YW5hZ2VyLnN0ZXBJbnRvKCk7CisgICAgZWxzZQorICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhv c3QuYmVlcCgpOwogfTsKIAogV0kuZGVidWdnZXJTdGVwT3V0ID0gZnVuY3Rpb24oZXZlbnQpCiB7 Ci0gICAgV0kuZGVidWdnZXJNYW5hZ2VyLnN0ZXBPdXQoKTsKKyAgICBpZiAoV0kuZGVidWdnZXJN YW5hZ2VyLnBhdXNlZCkKKyAgICAgICAgV0kuZGVidWdnZXJNYW5hZ2VyLnN0ZXBPdXQoKTsKKyAg ICBlbHNlCisgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5iZWVwKCk7CiB9OwogCiBXSS5f Zm9jdXNTZWFyY2hGaWVsZCA9IGZ1bmN0aW9uKGV2ZW50KQo= 448546 2022-01-06 16:46:25 -0800 2022-01-06 21:32:59 -0800 Patch v1.1 bug-234575-20220106164624.patch text/plain 4048 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl NjhjZWQ4YWM0YWVkYTI0ZDZiYmJmZjRiOTc2NzI5Y2VjODc3N2U2Li5iZjU3ODc1YTk0ZDQzYWQ5 ZmNjZGE2NTJkNTRiMjQ3ZDk3MjMxZjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAyMi0wMS0wNiAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgVW5jYXVnaHQgRXhjZXB0aW9uOiBDYW5ub3Qgc3RlcCBvdmVyIGJlY2F1c2Ug ZGVidWdnZXIgaXMgbm90IHBhdXNlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM0NTc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUHJldmlvdXNseSBrZXlib2FyZCBzaG9ydGN1dHMgZm9yIGFkdmFuY2lu ZyB0aGUgZGVidWdnZXIgZGlkIG5vdCBjaGVjayB0byBtYWtlIHN1cmUgdGhhdCB0aGUgZGVidWdn ZXIgd2FzCisgICAgICAgIGFjdHVhbGx5IHBhdXNlZCBiZWZvcmUgYXR0ZW1wdGluZyB0byBzdGVw LiBUaGlzIGxlZCB0byBhbiB1bmNhdWdodCBleGNlcHRpb24gaW4gZW5naW5lZXJpbmcgYnVpbGRz LiBXZSBub3cKKyAgICAgICAgZW5hYmxlIGFuZCBkaXNhYmxlIHRoZXNlIGtleWJvYXJkIHNob3J0 Y3V0cyBiYXNlZCBvbiB0aGUgd2hldGhlciBvciBub3QgdGhlIGRlYnVnZ2VyIGlzIGN1cnJlbnRs eSBwYXVzZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKwogMjAy MS0xMi0zMSAgVGltIE5ndXllbiAgPG50aW1AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGZpeCBhc3NlcnQgdGV4dCBpbiBHcmFkaWVudC5qcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IGNlNWM3ZmYyMzQyZTAw ZGZjNTY5YjE4NDQxYjRkNzAxMDY2NzhjMmMuLmZmMGE4NzczM2ZjYWIwMmEwODY4YzEzYjVhYzY1 YTNhNmI5MDA0NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL01haW4uanMKQEAgLTEzMiw2ICsxMzIsNyBAQCBXSS5sb2FkZWQgPSBmdW5jdGlvbigp CiAKICAgICAvLyBSZWdpc3RlciBmb3IgZXZlbnRzLgogICAgIFdJLmRlYnVnZ2VyTWFuYWdlci5h ZGRFdmVudExpc3RlbmVyKFdJLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5QYXVzZWQsIFdJLl9kZWJ1 Z2dlckRpZFBhdXNlLCBXSSk7CisgICAgV0kuZGVidWdnZXJNYW5hZ2VyLmFkZEV2ZW50TGlzdGVu ZXIoV0kuRGVidWdnZXJNYW5hZ2VyLkV2ZW50LlJlc3VtZWQsIFdJLl9kZWJ1Z2dlckRpZFJlc3Vt ZSwgV0kpOwogICAgIFdJLmRvbU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01NYW5hZ2Vy LkV2ZW50Lkluc3BlY3RNb2RlU3RhdGVDaGFuZ2VkLCBXSS5faW5zcGVjdE1vZGVTdGF0ZUNoYW5n ZWQsIFdJKTsKICAgICBXSS5kb21NYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuRE9NTWFuYWdl ci5FdmVudC5ET01Ob2RlV2FzSW5zcGVjdGVkLCBXSS5fZG9tTm9kZVdhc0luc3BlY3RlZCwgV0kp OwogICAgIFdJLmRvbVN0b3JhZ2VNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuRE9NU3RvcmFn ZU1hbmFnZXIuRXZlbnQuRE9NU3RvcmFnZU9iamVjdFdhc0luc3BlY3RlZCwgV0kuX2RvbVN0b3Jh Z2VXYXNJbnNwZWN0ZWQsIFdJKTsKQEAgLTM0Miw2ICszNDMsOCBAQCBXSS5jb250ZW50TG9hZGVk ID0gZnVuY3Rpb24oKQogICAgICAgICBXSS5zdGVwTmV4dEFsdGVybmF0ZUtleWJvYXJkU2hvcnRj dXQgPSBuZXcgV0kuS2V5Ym9hcmRTaG9ydGN1dChXSS5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVy LlNoaWZ0IHwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCBX SS5LZXlib2FyZFNob3J0Y3V0LktleS5TaW5nbGVRdW90ZSwgV0kuZGVidWdnZXJTdGVwTmV4dCk7 CiAgICAgfQogCisgICAgV0kuX3VwZGF0ZURlYnVnZ2VyS2V5Ym9hcmRTaG9ydGN1dHMoKTsKKwog ICAgIFdJLnNldHRpbmdzS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0 KFdJLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgV0kuS2V5Ym9h cmRTaG9ydGN1dC5LZXkuQ29tbWEsIFdJLl9oYW5kbGVTZXR0aW5nc0tleWJvYXJkU2hvcnRjdXQp OwogCiAgICAgV0kuX3RvZ2dsZVByZXZpb3VzRG9ja0NvbmZpZ3VyYXRpb25LZXlib2FyZFNob3J0 Y3V0ID0gbmV3IFdJLktleWJvYXJkU2hvcnRjdXQoV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmll ci5Db21tYW5kT3JDb250cm9sIHwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5TaGlmdCwg IkQiLCBXSS5fdG9nZ2xlUHJldmlvdXNEb2NrQ29uZmlndXJhdGlvbik7CkBAIC0xNjY5LDEwICsx NjcyLDMzIEBAIFdJLl9oYW5kbGVEcmFnT3ZlciA9IGZ1bmN0aW9uKGV2ZW50KQogV0kuX2RlYnVn Z2VyRGlkUGF1c2UgPSBmdW5jdGlvbihldmVudCkKIHsKICAgICBXSS5zaG93U291cmNlc1RhYih7 c2hvd1Njb3BlQ2hhaW5TaWRlYmFyOiBXSS5zZXR0aW5ncy5zaG93U2NvcGVDaGFpbk9uUGF1c2Uu dmFsdWV9KTsKKyAgICBXSS5fdXBkYXRlRGVidWdnZXJLZXlib2FyZFNob3J0Y3V0cygpOwogCiAg ICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmJyaW5nVG9Gcm9udCgpOwogfTsKIAorV0kuX2RlYnVn Z2VyRGlkUmVzdW1lID0gZnVuY3Rpb24oZXZlbnQpCit7CisgICAgV0kuX3VwZGF0ZURlYnVnZ2Vy S2V5Ym9hcmRTaG9ydGN1dHMoKTsKK307CisKK1dJLl91cGRhdGVEZWJ1Z2dlcktleWJvYXJkU2hv cnRjdXRzID0gZnVuY3Rpb24oKQoreworICAgIFdJLnN0ZXBPdmVyS2V5Ym9hcmRTaG9ydGN1dC5k aXNhYmxlZCA9ICFXSS5kZWJ1Z2dlck1hbmFnZXIucGF1c2VkOworICAgIFdJLnN0ZXBJbnRvS2V5 Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9ICFXSS5kZWJ1Z2dlck1hbmFnZXIucGF1c2VkOworICAg IFdJLnN0ZXBPdXRLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gIVdJLmRlYnVnZ2VyTWFuYWdl ci5wYXVzZWQ7CisgICAgV0kucGF1c2VPclJlc3VtZUFsdGVybmF0ZUtleWJvYXJkU2hvcnRjdXQu ZGlzYWJsZWQgPSAhV0kuZGVidWdnZXJNYW5hZ2VyLnBhdXNlZDsKKyAgICBXSS5zdGVwT3ZlckFs dGVybmF0ZUtleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSAhV0kuZGVidWdnZXJNYW5hZ2VyLnBh dXNlZDsKKyAgICBXSS5zdGVwSW50b0FsdGVybmF0ZUtleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQg PSAhV0kuZGVidWdnZXJNYW5hZ2VyLnBhdXNlZDsKKyAgICBXSS5zdGVwT3V0QWx0ZXJuYXRlS2V5 Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9ICFXSS5kZWJ1Z2dlck1hbmFnZXIucGF1c2VkOworCisg ICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TIDEzLjQpOiBEZWJ1Z2dlci5zdGVwTmV4dCBkaWQgbm90 IGV4aXN0LgorICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLmhhc0NvbW1hbmQoIkRlYnVnZ2VyLnN0 ZXBOZXh0IikpIHsKKyAgICAgICAgV0kuc3RlcE5leHRLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVk ID0gIVdJLmRlYnVnZ2VyTWFuYWdlci5wYXVzZWQ7CisgICAgICAgIFdJLnN0ZXBOZXh0QWx0ZXJu YXRlS2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9ICFXSS5kZWJ1Z2dlck1hbmFnZXIucGF1c2Vk OworICAgIH0KK307CisKIFdJLl9mcmFtZVdhc0FkZGVkID0gZnVuY3Rpb24oZXZlbnQpCiB7CiAg ICAgaWYgKCFXSS5fZnJhbWVJZGVudGlmaWVyVG9TaG93U291cmNlQ29kZVdoZW5BdmFpbGFibGUp Cg== 448560 2022-01-06 21:33:01 -0800 2022-01-07 12:22:13 -0800 Patch v1.2 bug-234575-20220106213301.patch text/plain 3855 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl NjhjZWQ4YWM0YWVkYTI0ZDZiYmJmZjRiOTc2NzI5Y2VjODc3N2U2Li5hZjBiZTg3NTc5ZDU5MGJk MGNiNGVmMzgzYWY2NDgzNDc4Y2FmYWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAyMi0wMS0wNiAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgVW5jYXVnaHQgRXhjZXB0aW9uOiBDYW5ub3Qgc3RlcCBvdmVyIGJlY2F1c2Ug ZGVidWdnZXIgaXMgbm90IHBhdXNlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM0NTc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGV2aW4gUm91c3Nv LgorCisgICAgICAgIFByZXZpb3VzbHkga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhZHZhbmNpbmcg dGhlIGRlYnVnZ2VyIGRpZCBub3QgY2hlY2sgdG8gbWFrZSBzdXJlIHRoYXQgdGhlIGRlYnVnZ2Vy IHdhcworICAgICAgICBhY3R1YWxseSBwYXVzZWQgYmVmb3JlIGF0dGVtcHRpbmcgdG8gc3RlcC4g VGhpcyBsZWQgdG8gYW4gdW5jYXVnaHQgZXhjZXB0aW9uIGluIGVuZ2luZWVyaW5nIGJ1aWxkcy4g V2Ugbm93CisgICAgICAgIGVuYWJsZSBhbmQgZGlzYWJsZSB0aGVzZSBrZXlib2FyZCBzaG9ydGN1 dHMgYmFzZWQgb24gdGhlIHdoZXRoZXIgb3Igbm90IHRoZSBkZWJ1Z2dlciBpcyBjdXJyZW50bHkg cGF1c2VkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisKIDIwMjEt MTItMzEgIFRpbSBOZ3V5ZW4gIDxudGltQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBmaXggYXNzZXJ0IHRleHQgaW4gR3JhZGllbnQuanMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCBjZTVjN2ZmMjM0MmUwMGRm YzU2OWIxODQ0MWI0ZDcwMTA2Njc4YzJjLi40Y2M3YTNhN2Q4Yjc2MWYwYjA0OWNkN2Q0YmUxMjBi YWFkZDQ3NThjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9NYWluLmpzCkBAIC0xMzIsNiArMTMyLDcgQEAgV0kubG9hZGVkID0gZnVuY3Rpb24oKQog CiAgICAgLy8gUmVnaXN0ZXIgZm9yIGV2ZW50cy4KICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIuYWRk RXZlbnRMaXN0ZW5lcihXSS5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuUGF1c2VkLCBXSS5fZGVidWdn ZXJEaWRQYXVzZSwgV0kpOworICAgIFdJLmRlYnVnZ2VyTWFuYWdlci5hZGRFdmVudExpc3RlbmVy KFdJLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5SZXN1bWVkLCBXSS5fZGVidWdnZXJEaWRSZXN1bWUs IFdJKTsKICAgICBXSS5kb21NYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuRE9NTWFuYWdlci5F dmVudC5JbnNwZWN0TW9kZVN0YXRlQ2hhbmdlZCwgV0kuX2luc3BlY3RNb2RlU3RhdGVDaGFuZ2Vk LCBXSSk7CiAgICAgV0kuZG9tTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkRPTU1hbmFnZXIu RXZlbnQuRE9NTm9kZVdhc0luc3BlY3RlZCwgV0kuX2RvbU5vZGVXYXNJbnNwZWN0ZWQsIFdJKTsK ICAgICBXSS5kb21TdG9yYWdlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkRPTVN0b3JhZ2VN YW5hZ2VyLkV2ZW50LkRPTVN0b3JhZ2VPYmplY3RXYXNJbnNwZWN0ZWQsIFdJLl9kb21TdG9yYWdl V2FzSW5zcGVjdGVkLCBXSSk7CkBAIC0zNDIsNiArMzQzLDggQEAgV0kuY29udGVudExvYWRlZCA9 IGZ1bmN0aW9uKCkKICAgICAgICAgV0kuc3RlcE5leHRBbHRlcm5hdGVLZXlib2FyZFNob3J0Y3V0 ID0gbmV3IFdJLktleWJvYXJkU2hvcnRjdXQoV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5T aGlmdCB8IFdJLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgV0ku S2V5Ym9hcmRTaG9ydGN1dC5LZXkuU2luZ2xlUXVvdGUsIFdJLmRlYnVnZ2VyU3RlcE5leHQpOwog ICAgIH0KIAorICAgIFdJLl91cGRhdGVEZWJ1Z2dlcktleWJvYXJkU2hvcnRjdXRzKCk7CisKICAg ICBXSS5zZXR0aW5nc0tleWJvYXJkU2hvcnRjdXQgPSBuZXcgV0kuS2V5Ym9hcmRTaG9ydGN1dChX SS5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsIFdJLktleWJvYXJk U2hvcnRjdXQuS2V5LkNvbW1hLCBXSS5faGFuZGxlU2V0dGluZ3NLZXlib2FyZFNob3J0Y3V0KTsK IAogICAgIFdJLl90b2dnbGVQcmV2aW91c0RvY2tDb25maWd1cmF0aW9uS2V5Ym9hcmRTaG9ydGN1 dCA9IG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KFdJLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIu Q29tbWFuZE9yQ29udHJvbCB8IFdJLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQsICJE IiwgV0kuX3RvZ2dsZVByZXZpb3VzRG9ja0NvbmZpZ3VyYXRpb24pOwpAQCAtMTY2OSwxMCArMTY3 MiwzNCBAQCBXSS5faGFuZGxlRHJhZ092ZXIgPSBmdW5jdGlvbihldmVudCkKIFdJLl9kZWJ1Z2dl ckRpZFBhdXNlID0gZnVuY3Rpb24oZXZlbnQpCiB7CiAgICAgV0kuc2hvd1NvdXJjZXNUYWIoe3No b3dTY29wZUNoYWluU2lkZWJhcjogV0kuc2V0dGluZ3Muc2hvd1Njb3BlQ2hhaW5PblBhdXNlLnZh bHVlfSk7CisgICAgV0kuX3VwZGF0ZURlYnVnZ2VyS2V5Ym9hcmRTaG9ydGN1dHMoKTsKIAogICAg IEluc3BlY3RvckZyb250ZW5kSG9zdC5icmluZ1RvRnJvbnQoKTsKIH07CiAKK1dJLl9kZWJ1Z2dl ckRpZFJlc3VtZSA9IGZ1bmN0aW9uKGV2ZW50KQoreworICAgIFdJLl91cGRhdGVEZWJ1Z2dlcktl eWJvYXJkU2hvcnRjdXRzKCk7Cit9OworCitXSS5fdXBkYXRlRGVidWdnZXJLZXlib2FyZFNob3J0 Y3V0cyA9IGZ1bmN0aW9uKCkKK3sKKyAgICBsZXQgcGF1c2VkID0gV0kuZGVidWdnZXJNYW5hZ2Vy LnBhdXNlZDsKKworICAgIFdJLnN0ZXBPdmVyS2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9ICFw YXVzZWQ7CisgICAgV0kuc3RlcEludG9LZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gIXBhdXNl ZDsKKyAgICBXSS5zdGVwT3V0S2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9ICFwYXVzZWQ7Cisg ICAgV0kuc3RlcE92ZXJBbHRlcm5hdGVLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gIXBhdXNl ZDsKKyAgICBXSS5zdGVwSW50b0FsdGVybmF0ZUtleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSAh cGF1c2VkOworICAgIFdJLnN0ZXBPdXRBbHRlcm5hdGVLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVk ID0gIXBhdXNlZDsKKworICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyAxMy40KTogRGVidWdnZXIu c3RlcE5leHQgZGlkIG5vdCBleGlzdC4KKyAgICBpZiAoSW5zcGVjdG9yQmFja2VuZC5oYXNDb21t YW5kKCJEZWJ1Z2dlci5zdGVwTmV4dCIpKSB7CisgICAgICAgIFdJLnN0ZXBOZXh0S2V5Ym9hcmRT aG9ydGN1dC5kaXNhYmxlZCA9ICFwYXVzZWQ7CisgICAgICAgIFdJLnN0ZXBOZXh0QWx0ZXJuYXRl S2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9ICFwYXVzZWQ7CisgICAgfQorfTsKKwogV0kuX2Zy YW1lV2FzQWRkZWQgPSBmdW5jdGlvbihldmVudCkKIHsKICAgICBpZiAoIVdJLl9mcmFtZUlkZW50 aWZpZXJUb1Nob3dTb3VyY2VDb2RlV2hlbkF2YWlsYWJsZSkK