88800 2012-06-11 13:34:45 -0700 [GTK] Showing the context menu in the Web Inspector can crash the browser 2012-07-05 23:27:51 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 a.renevier webkit-unassigned cgarcia mrobinson webkit.review.bot oldest_to_newest 646213 0 a.renevier 2012-06-11 13:34:45 -0700 Hi, when trying to display context menu in web inspector, it does not display (at best) or it crashes (at worst). I could always reproduce it when lauching web inspector from midori (linked with latest webkit trunk), and right clicking on an item in the network panel. I investigated and discovered that GtkMenuItems where created as childs of GtkMenu* menu in JSInspectorFrontendHost::showContextMenu. Then, they are stored in a vector, and appended to a new GtkMenu item in ContextMenuController::showContextMenu Then, at the end of JSInspectorFrontendHost::showContextMenu menu destructor is called, and the menu widget is destroyed (along with all of its children). So, in contextMenuItemActivated (webkitwebview.cpp), the GtkMenuItem has been destroyed, hence the crash. 646218 1 146896 a.renevier 2012-06-11 13:40:40 -0700 Created attachment 146896 patch proposal 658140 2 146896 mrobinson 2012-06-26 17:15:37 -0700 Comment on attachment 146896 patch proposal View in context: https://bugs.webkit.org/attachment.cgi?id=146896&action=review > Source/WebCore/ChangeLog:5 > + [GTK] Remove ContextMenuItem from its parent before appending it > + again to a new parent > + https://bugs.webkit.org/show_bug.cgi?id=88800 Minor nit here: You should use prepare-ChangeLogs to generate your changelogs, so that the bug title is above the bug number. 658148 3 149644 a.renevier 2012-06-26 17:32:01 -0700 Created attachment 149644 updated patch to fix ChangeLog style 658150 4 mrobinson 2012-06-26 17:33:17 -0700 CCing cgarcia who has worked on context menus more recently than I. 662770 5 149644 cgarcia 2012-07-04 02:11:55 -0700 Comment on attachment 149644 updated patch to fix ChangeLog style View in context: https://bugs.webkit.org/attachment.cgi?id=149644&action=review Thanks for the patch and sorry for the delay to review it. This is indeed a problem of using GtkMenu directly in ContextMenu. > Source/WebCore/platform/gtk/ContextMenuGtk.cpp:56 > + if (parent && parent != GTK_WIDGET(m_platformDescription)) { Adding a widget twice to the same parent is an error too, so you only need to check whether it has parent. > Source/WebCore/platform/gtk/ContextMenuGtk.cpp:62 > + gtk_menu_shell_append(GTK_MENU_SHELL(m_platformDescription), platformItem); > + gtk_widget_show(platformItem); You are leaking the platformItem in case of being reparented. You can fix the leak and simplify the code a bit using GRefPtr, someting like this: GRefPtr<GtkWidget> platformItem = GTK_WIDGET(item.releasePlatformDescription()); ASSERT(platformItem); if (GtkWidget* parent = gtk_widget_get_parent(platformItem.get())) gtk_container_remove(GTK_CONTAINER(parent), platformItem.get()); gtk_menu_shell_append(GTK_MENU_SHELL(m_platformDescription), platformItem.get()); gtk_widget_show(platformItem.get()); If the menu item has a floating reference (it hasn't been added to a container), the RefPtr consumes the floating reference and the reference counter will be 1. Then it's added to the parent, reference counter is increased, and when the function finishes the RefPtr releases its reference and the GtkMenu holds the only reference. 663598 6 150950 a.renevier 2012-07-05 10:05:37 -0700 Created attachment 150950 updated patch 663600 7 webkit.review.bot 2012-07-05 10:07:31 -0700 Attachment 150950 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/gtk/ContextMenuGtk.cpp:27: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 663630 8 150950 cgarcia 2012-07-05 10:40:53 -0700 Comment on attachment 150950 updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=150950&action=review > Source/WebCore/platform/gtk/ContextMenuGtk.cpp:28 > #include <gtk/gtk.h> This style issue is not actually introduced by your patch, but we can simply fix it now that we are changing these lines 663716 9 150980 a.renevier 2012-07-05 13:55:58 -0700 Created attachment 150980 updated patch 663896 10 150980 cgarcia 2012-07-05 23:17:15 -0700 Comment on attachment 150980 updated patch Thanks! 663903 11 150980 webkit.review.bot 2012-07-05 23:27:46 -0700 Comment on attachment 150980 updated patch Clearing flags on attachment: 150980 Committed r121945: <http://trac.webkit.org/changeset/121945> 663904 12 webkit.review.bot 2012-07-05 23:27:51 -0700 All reviewed patches have been landed. Closing bug. 146896 2012-06-11 13:40:40 -0700 2012-06-26 17:31:57 -0700 patch proposal bug-88800-20120611134038.patch text/plain 1896 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5OTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzU3YTQxNDU2MWNjMDk3 YWEwNWMyNzAxYTViOGUxNzFkOTEwN2QwZi4uZWU4OGI4NTBmMzdkZTc5MTkxMWQxYzUwZmZkMjM4 MWIxYzA2Zjc0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA2LTExICBBcm5h dWQgUmVuZXZpZXIgIDxhcm5vQHJlbmV2aWVyLm5ldD4KKworICAgICAgICBbR1RLXSBSZW1vdmUg Q29udGV4dE1lbnVJdGVtIGZyb20gaXRzIHBhcmVudCBiZWZvcmUgYXBwZW5kaW5nIGl0CisgICAg ICAgIGFnYWluIHRvIGEgbmV3IHBhcmVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODg4MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9Db250ZXh0TWVudUd0ay5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDb250ZXh0TWVudTo6YXBwZW5kSXRlbSk6CisKIDIwMTItMDYtMTEgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQuIEZpeCBtYWtlIGRpc3RjaGVjayBpc3N1ZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvQ29udGV4dE1lbnVHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL0NvbnRleHRNZW51R3RrLmNwcAppbmRleCA2MmE3ZWVjZDJiZWNmZjQ3MzI3ZmQz MjMwZDgwMzBlYTA4OGNjYjVkLi44NjM4NmJjOGM1NDI1OGI5MDM3MTMxNTY5YzllZjE4Mzg5YjI4 ZWNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ29udGV4dE1lbnVH dGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Db250ZXh0TWVudUd0ay5j cHAKQEAgLTQ4LDEwICs0OCwxOCBAQCB2b2lkIENvbnRleHRNZW51OjphcHBlbmRJdGVtKENvbnRl eHRNZW51SXRlbSYgaXRlbSkKIHsKICAgICBBU1NFUlQobV9wbGF0Zm9ybURlc2NyaXB0aW9uKTsK IAotICAgIEd0a01lbnVJdGVtKiBwbGF0Zm9ybUl0ZW0gPSBpdGVtLnJlbGVhc2VQbGF0Zm9ybURl c2NyaXB0aW9uKCk7CisgICAgR3RrV2lkZ2V0KiBwbGF0Zm9ybUl0ZW0gPSBHVEtfV0lER0VUKGl0 ZW0ucmVsZWFzZVBsYXRmb3JtRGVzY3JpcHRpb24oKSk7CiAgICAgQVNTRVJUKHBsYXRmb3JtSXRl bSk7Ci0gICAgZ3RrX21lbnVfc2hlbGxfYXBwZW5kKEdUS19NRU5VX1NIRUxMKG1fcGxhdGZvcm1E ZXNjcmlwdGlvbiksIEdUS19XSURHRVQocGxhdGZvcm1JdGVtKSk7Ci0gICAgZ3RrX3dpZGdldF9z aG93KEdUS19XSURHRVQocGxhdGZvcm1JdGVtKSk7CisKKyAgICBHdGtXaWRnZXQqIHBhcmVudCA9 IGd0a193aWRnZXRfZ2V0X3BhcmVudChwbGF0Zm9ybUl0ZW0pOworCisgICAgaWYgKHBhcmVudCAm JiBwYXJlbnQgIT0gR1RLX1dJREdFVChtX3BsYXRmb3JtRGVzY3JpcHRpb24pKSB7CisgICAgICAg IGdfb2JqZWN0X3JlZihwbGF0Zm9ybUl0ZW0pOworICAgICAgICBndGtfY29udGFpbmVyX3JlbW92 ZShHVEtfQ09OVEFJTkVSKHBhcmVudCksIHBsYXRmb3JtSXRlbSk7CisgICAgfQorCisgICAgZ3Rr X21lbnVfc2hlbGxfYXBwZW5kKEdUS19NRU5VX1NIRUxMKG1fcGxhdGZvcm1EZXNjcmlwdGlvbiks IHBsYXRmb3JtSXRlbSk7CisgICAgZ3RrX3dpZGdldF9zaG93KHBsYXRmb3JtSXRlbSk7CiB9CiAK IHZvaWQgQ29udGV4dE1lbnU6OnNldFBsYXRmb3JtRGVzY3JpcHRpb24oUGxhdGZvcm1NZW51RGVz Y3JpcHRpb24gbWVudSkK 149644 2012-06-26 17:32:01 -0700 2012-07-05 10:05:33 -0700 updated patch to fix ChangeLog style bug-88800-20120626173200.patch text/plain 2075 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWJmOGI4NTdjZDU2YjVh YmJkNTdhM2M5NmEyNTk5MDM2N2I0YzdlZC4uZDAwNTk0ZTZjOWNkOThmYWYzZWU5NWU4MjBlNGYw YmNjNjc5YTRhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA2LTI2ICBBcm5h dWQgUmVuZXZpZXIgIDxhcm5vQHJlbmV2aWVyLm5ldD4KKworICAgICAgICBbR1RLXSBTaG93aW5n IHRoZSBjb250ZXh0IG1lbnUgaW4gdGhlIFdlYiBJbnNwZWN0b3IgY2FuIGNyYXNoIHRoZSBicm93 c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODgw MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92 ZSBDb250ZXh0TWVudUl0ZW0gZnJvbSBpdHMgcGFyZW50IGJlZm9yZSBhcHBlbmRpbmcgaXQgYWdh aW4gdG8gYSBuZXcgcGFyZW50CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBiZWhhdmlvciBpcyB1 bmNoYW5nZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvQ29udGV4dE1lbnVHdGsuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnU6OmFwcGVuZEl0ZW0pOgorCiAyMDEyLTA2LTIy ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9t aXVtXSBMYXllclJlbmRlcmVyQ2hyb21pdW0gaXMgbm90IGdldHRpbmcgdmlzaWJpbGl0eSBtZXNz YWdlcyBpbiBzaW5nbGUgdGhyZWFkZWQgY29tcG9zaXRpbmcgbW9kZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Db250ZXh0TWVudUd0ay5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvQ29udGV4dE1lbnVHdGsuY3BwCmluZGV4IDYyYTdlZWNkMmJlY2Zm NDczMjdmZDMyMzBkODAzMGVhMDg4Y2NiNWQuLjg2Mzg2YmM4YzU0MjU4YjkwMzcxMzE1NjljOWVm MTgzODliMjhlY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Db250 ZXh0TWVudUd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0NvbnRleHRN ZW51R3RrLmNwcApAQCAtNDgsMTAgKzQ4LDE4IEBAIHZvaWQgQ29udGV4dE1lbnU6OmFwcGVuZEl0 ZW0oQ29udGV4dE1lbnVJdGVtJiBpdGVtKQogewogICAgIEFTU0VSVChtX3BsYXRmb3JtRGVzY3Jp cHRpb24pOwogCi0gICAgR3RrTWVudUl0ZW0qIHBsYXRmb3JtSXRlbSA9IGl0ZW0ucmVsZWFzZVBs YXRmb3JtRGVzY3JpcHRpb24oKTsKKyAgICBHdGtXaWRnZXQqIHBsYXRmb3JtSXRlbSA9IEdUS19X SURHRVQoaXRlbS5yZWxlYXNlUGxhdGZvcm1EZXNjcmlwdGlvbigpKTsKICAgICBBU1NFUlQocGxh dGZvcm1JdGVtKTsKLSAgICBndGtfbWVudV9zaGVsbF9hcHBlbmQoR1RLX01FTlVfU0hFTEwobV9w bGF0Zm9ybURlc2NyaXB0aW9uKSwgR1RLX1dJREdFVChwbGF0Zm9ybUl0ZW0pKTsKLSAgICBndGtf d2lkZ2V0X3Nob3coR1RLX1dJREdFVChwbGF0Zm9ybUl0ZW0pKTsKKworICAgIEd0a1dpZGdldCog cGFyZW50ID0gZ3RrX3dpZGdldF9nZXRfcGFyZW50KHBsYXRmb3JtSXRlbSk7CisKKyAgICBpZiAo cGFyZW50ICYmIHBhcmVudCAhPSBHVEtfV0lER0VUKG1fcGxhdGZvcm1EZXNjcmlwdGlvbikpIHsK KyAgICAgICAgZ19vYmplY3RfcmVmKHBsYXRmb3JtSXRlbSk7CisgICAgICAgIGd0a19jb250YWlu ZXJfcmVtb3ZlKEdUS19DT05UQUlORVIocGFyZW50KSwgcGxhdGZvcm1JdGVtKTsKKyAgICB9CisK KyAgICBndGtfbWVudV9zaGVsbF9hcHBlbmQoR1RLX01FTlVfU0hFTEwobV9wbGF0Zm9ybURlc2Ny aXB0aW9uKSwgcGxhdGZvcm1JdGVtKTsKKyAgICBndGtfd2lkZ2V0X3Nob3cocGxhdGZvcm1JdGVt KTsKIH0KIAogdm9pZCBDb250ZXh0TWVudTo6c2V0UGxhdGZvcm1EZXNjcmlwdGlvbihQbGF0Zm9y bU1lbnVEZXNjcmlwdGlvbiBtZW51KQo= 150950 2012-07-05 10:05:37 -0700 2012-07-05 13:55:54 -0700 updated patch bug-88800-20120705100536.patch text/plain 2111 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmE2YjRjZDgzYzUxODAz ODk4MzBjMGRkMDZmMTI0MmRlOWZhZDBhMy4uMDYwMGIyMjc0ZjhmMjM1MjUwOTcwMjQxY2MxZWI5 OTAyYWM0YmEwZSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA3LTA1ICBBcm5h dWQgUmVuZXZpZXIgIDxhcm5vQHJlbmV2aWVyLm5ldD4KKworICAgICAgICBbR1RLXSBTaG93aW5n IHRoZSBjb250ZXh0IG1lbnUgaW4gdGhlIFdlYiBJbnNwZWN0b3IgY2FuIGNyYXNoIHRoZSBicm93 c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODgw MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92 ZSBDb250ZXh0TWVudUl0ZW0gZnJvbSBpdHMgcGFyZW50IGJlZm9yZSBhcHBlbmRpbmcgaXQgYWdh aW4gdG8gYQorICAgICAgICBuZXcgcGFyZW50CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBiZWhh dmlvciBpcyB1bmNoYW5nZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvQ29udGV4dE1lbnVH dGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnU6OmFwcGVuZEl0ZW0pOgorCiAy MDEyLTA2LTI3ICBTaGlueWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBIVE1MU3R5bGVFbGVtZW50OjpyZW1vdmVkRnJvbSBzZWVtcyBpbmNvcnJlY3QuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ29udGV4dE1lbnVHdGsuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0NvbnRleHRNZW51R3RrLmNwcAppbmRleCA2MmE3 ZWVjZDJiZWNmZjQ3MzI3ZmQzMjMwZDgwMzBlYTA4OGNjYjVkLi4xNjAzNDAxMjgwMDM0NzFjOWVk YTRlZjhhOGNjZmE1YjA2NDEwZTc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvQ29udGV4dE1lbnVHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9Db250ZXh0TWVudUd0ay5jcHAKQEAgLTI0LDYgKzI0LDcgQEAKICNpbmNsdWRlICJDb250ZXh0 TWVudS5oIgogCiAjaW5jbHVkZSA8d3RmL2dvYmplY3QvR093blB0ci5oPgorI2luY2x1ZGUgPHd0 Zi9nb2JqZWN0L0dSZWZQdHIuaD4KICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKQEAgLTQ4LDEwICs0OSwxNCBAQCB2b2lkIENvbnRleHRNZW51OjphcHBlbmRJdGVt KENvbnRleHRNZW51SXRlbSYgaXRlbSkKIHsKICAgICBBU1NFUlQobV9wbGF0Zm9ybURlc2NyaXB0 aW9uKTsKIAotICAgIEd0a01lbnVJdGVtKiBwbGF0Zm9ybUl0ZW0gPSBpdGVtLnJlbGVhc2VQbGF0 Zm9ybURlc2NyaXB0aW9uKCk7CisgICAgR1JlZlB0cjxHdGtXaWRnZXQ+IHBsYXRmb3JtSXRlbSA9 IEdUS19XSURHRVQoaXRlbS5yZWxlYXNlUGxhdGZvcm1EZXNjcmlwdGlvbigpKTsKICAgICBBU1NF UlQocGxhdGZvcm1JdGVtKTsKLSAgICBndGtfbWVudV9zaGVsbF9hcHBlbmQoR1RLX01FTlVfU0hF TEwobV9wbGF0Zm9ybURlc2NyaXB0aW9uKSwgR1RLX1dJREdFVChwbGF0Zm9ybUl0ZW0pKTsKLSAg ICBndGtfd2lkZ2V0X3Nob3coR1RLX1dJREdFVChwbGF0Zm9ybUl0ZW0pKTsKKworICAgIGlmIChH dGtXaWRnZXQqIHBhcmVudCA9IGd0a193aWRnZXRfZ2V0X3BhcmVudChwbGF0Zm9ybUl0ZW0uZ2V0 KCkpKQorICAgICAgICBndGtfY29udGFpbmVyX3JlbW92ZShHVEtfQ09OVEFJTkVSKHBhcmVudCks IHBsYXRmb3JtSXRlbS5nZXQoKSk7CisKKyAgICBndGtfbWVudV9zaGVsbF9hcHBlbmQoR1RLX01F TlVfU0hFTEwobV9wbGF0Zm9ybURlc2NyaXB0aW9uKSwgcGxhdGZvcm1JdGVtLmdldCgpKTsKKyAg ICBndGtfd2lkZ2V0X3Nob3cocGxhdGZvcm1JdGVtLmdldCgpKTsKIH0KIAogdm9pZCBDb250ZXh0 TWVudTo6c2V0UGxhdGZvcm1EZXNjcmlwdGlvbihQbGF0Zm9ybU1lbnVEZXNjcmlwdGlvbiBtZW51 KQo= 150980 2012-07-05 13:55:58 -0700 2012-07-05 23:27:46 -0700 updated patch bug-88800-20120705135555.patch text/plain 2149 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmE2YjRjZDgzYzUxODAz ODk4MzBjMGRkMDZmMTI0MmRlOWZhZDBhMy4uMDYwMGIyMjc0ZjhmMjM1MjUwOTcwMjQxY2MxZWI5 OTAyYWM0YmEwZSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA3LTA1ICBBcm5h dWQgUmVuZXZpZXIgIDxhcm5vQHJlbmV2aWVyLm5ldD4KKworICAgICAgICBbR1RLXSBTaG93aW5n IHRoZSBjb250ZXh0IG1lbnUgaW4gdGhlIFdlYiBJbnNwZWN0b3IgY2FuIGNyYXNoIHRoZSBicm93 c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODgw MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92 ZSBDb250ZXh0TWVudUl0ZW0gZnJvbSBpdHMgcGFyZW50IGJlZm9yZSBhcHBlbmRpbmcgaXQgYWdh aW4gdG8gYQorICAgICAgICBuZXcgcGFyZW50CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBiZWhh dmlvciBpcyB1bmNoYW5nZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvQ29udGV4dE1lbnVH dGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnU6OmFwcGVuZEl0ZW0pOgorCiAy MDEyLTA2LTI3ICBTaGlueWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBIVE1MU3R5bGVFbGVtZW50OjpyZW1vdmVkRnJvbSBzZWVtcyBpbmNvcnJlY3QuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ29udGV4dE1lbnVHdGsuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0NvbnRleHRNZW51R3RrLmNwcAppbmRleCA2MmE3 ZWVjZDJiZWNmZjQ3MzI3ZmQzMjMwZDgwMzBlYTA4OGNjYjVkLi44OTE2NTI1ZGIxZjg5YzJlN2Fj OTMwODM5M2RiZTE0ZTA3MTdkOGU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvQ29udGV4dE1lbnVHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9Db250ZXh0TWVudUd0ay5jcHAKQEAgLTIzLDggKzIzLDkgQEAKIAogI2luY2x1ZGUgIkNvbnRl eHRNZW51LmgiCiAKLSNpbmNsdWRlIDx3dGYvZ29iamVjdC9HT3duUHRyLmg+CiAjaW5jbHVkZSA8 Z3RrL2d0ay5oPgorI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dPd25QdHIuaD4KKyNpbmNsdWRlIDx3 dGYvZ29iamVjdC9HUmVmUHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNDgsMTAg KzQ5LDE0IEBAIHZvaWQgQ29udGV4dE1lbnU6OmFwcGVuZEl0ZW0oQ29udGV4dE1lbnVJdGVtJiBp dGVtKQogewogICAgIEFTU0VSVChtX3BsYXRmb3JtRGVzY3JpcHRpb24pOwogCi0gICAgR3RrTWVu dUl0ZW0qIHBsYXRmb3JtSXRlbSA9IGl0ZW0ucmVsZWFzZVBsYXRmb3JtRGVzY3JpcHRpb24oKTsK KyAgICBHUmVmUHRyPEd0a1dpZGdldD4gcGxhdGZvcm1JdGVtID0gR1RLX1dJREdFVChpdGVtLnJl bGVhc2VQbGF0Zm9ybURlc2NyaXB0aW9uKCkpOwogICAgIEFTU0VSVChwbGF0Zm9ybUl0ZW0pOwot ICAgIGd0a19tZW51X3NoZWxsX2FwcGVuZChHVEtfTUVOVV9TSEVMTChtX3BsYXRmb3JtRGVzY3Jp cHRpb24pLCBHVEtfV0lER0VUKHBsYXRmb3JtSXRlbSkpOwotICAgIGd0a193aWRnZXRfc2hvdyhH VEtfV0lER0VUKHBsYXRmb3JtSXRlbSkpOworCisgICAgaWYgKEd0a1dpZGdldCogcGFyZW50ID0g Z3RrX3dpZGdldF9nZXRfcGFyZW50KHBsYXRmb3JtSXRlbS5nZXQoKSkpCisgICAgICAgIGd0a19j b250YWluZXJfcmVtb3ZlKEdUS19DT05UQUlORVIocGFyZW50KSwgcGxhdGZvcm1JdGVtLmdldCgp KTsKKworICAgIGd0a19tZW51X3NoZWxsX2FwcGVuZChHVEtfTUVOVV9TSEVMTChtX3BsYXRmb3Jt RGVzY3JpcHRpb24pLCBwbGF0Zm9ybUl0ZW0uZ2V0KCkpOworICAgIGd0a193aWRnZXRfc2hvdyhw bGF0Zm9ybUl0ZW0uZ2V0KCkpOwogfQogCiB2b2lkIENvbnRleHRNZW51OjpzZXRQbGF0Zm9ybURl c2NyaXB0aW9uKFBsYXRmb3JtTWVudURlc2NyaXB0aW9uIG1lbnUpCg==