Mercurial > vim
changeset 28191:e4ca5a390f48 v8.2.4621
patch 8.2.4621: crash when using the tabline right-click menu
Commit: https://github.com/vim/vim/commit/9dd42a631162a8561bd7c4b0e89afd21f7994d8c
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Mar 24 18:04:49 2022 +0000
patch 8.2.4621: crash when using the tabline right-click menu
Problem: Crash when using the tabline right-click menu.
Solution: Use XtPointer for XmNuserData. (closes https://github.com/vim/vim/issues/10009)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 24 Mar 2022 19:15:03 +0100 |
| parents | 68db6dd59162 |
| children | dd264fa0980c |
| files | src/gui_motif.c src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_motif.c +++ b/src/gui_motif.c @@ -142,12 +142,12 @@ tabline_button_cb( XtPointer client_data UNUSED, XtPointer call_data UNUSED) { - int cmd, tab_idx; + XtPointer cmd, tab_idx; XtVaGetValues(w, XmNuserData, &cmd, NULL); XtVaGetValues(tabLine_menu, XmNuserData, &tab_idx, NULL); - send_tabline_menu_event(tab_idx, cmd); + send_tabline_menu_event((int)(long)tab_idx, (int)(long)cmd); } /* @@ -254,7 +254,7 @@ tabline_menu_cb( XtVaGetValues(tab_w, XmNpageNumber, &tab_idx, NULL); } - XtVaSetValues(tabLine_menu, XmNuserData, tab_idx, NULL); + XtVaSetValues(tabLine_menu, XmNuserData, (XtPointer)(long)tab_idx, NULL); XtVaGetValues(tabLine_menu, XmNchildren, &children, XmNnumChildren, &numChildren, NULL); XtManageChildren(children, numChildren); @@ -517,7 +517,7 @@ gui_x11_create_widgets(void) // Add the buttons to the tabline popup menu n = 0; - XtSetArg(args[n], XmNuserData, TABLINE_MENU_CLOSE); n++; + XtSetArg(args[n], XmNuserData, (XtPointer)TABLINE_MENU_CLOSE); n++; xms = XmStringCreate((char *)"Close tab", STRING_TAG); XtSetArg(args[n], XmNlabelString, xms); n++; button = XmCreatePushButton(tabLine_menu, "Close", args, n); @@ -526,7 +526,7 @@ gui_x11_create_widgets(void) XmStringFree(xms); n = 0; - XtSetArg(args[n], XmNuserData, TABLINE_MENU_NEW); n++; + XtSetArg(args[n], XmNuserData, (XtPointer)TABLINE_MENU_NEW); n++; xms = XmStringCreate((char *)"New Tab", STRING_TAG); XtSetArg(args[n], XmNlabelString, xms); n++; button = XmCreatePushButton(tabLine_menu, "New Tab", args, n); @@ -535,7 +535,7 @@ gui_x11_create_widgets(void) XmStringFree(xms); n = 0; - XtSetArg(args[n], XmNuserData, TABLINE_MENU_OPEN); n++; + XtSetArg(args[n], XmNuserData, (XtPointer)TABLINE_MENU_OPEN); n++; xms = XmStringCreate((char *)"Open tab...", STRING_TAG); XtSetArg(args[n], XmNlabelString, xms); n++; button = XmCreatePushButton(tabLine_menu, "Open tab...", args, n);