X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FApplications%2Faxwin3_src%2Flibaxwin3.so_src%2Fr_menu.c;fp=Usermode%2FApplications%2Faxwin3_src%2Flibaxwin3.so_src%2Fr_menu.c;h=9894abd05e6cf2a30d8c639db1983880d8453559;hb=16a06e033161374724932f90ebd8be420b4c4b91;hp=65525b988b1da84700249c16ede3df395d2673e2;hpb=3b61526612a44f31ad883cc1a1524ae3c85fb4e4;p=tpg%2Facess2.git diff --git a/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_menu.c b/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_menu.c index 65525b98..9894abd0 100644 --- a/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_menu.c +++ b/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_menu.c @@ -87,7 +87,7 @@ tAxWin3_MenuItem *AxWin3_Menu_AddItem( _SysDebug("ERROR: Realloc Failed"); return NULL; } - + ret = &info->Items[info->nItems-1]; ret->ID = info->nItems - 1; ret->Window = Menu; @@ -96,11 +96,14 @@ tAxWin3_MenuItem *AxWin3_Menu_AddItem( ret->SubMenu = SubMenu; { - tMenuIPC_AddItem *req; - int data_size; if(!Label) Label = ""; - data_size = sizeof(*req)+strlen(Label)+1; + tMenuIPC_AddItem *req; + int data_size = sizeof(*req) + strlen(Label)+1; req = malloc(data_size); + if( !req ) { + free(ret); + return NULL; + } req->ID = ret->ID; req->Flags = Flags; req->SubMenuID = AxWin3_int_GetWindowID(SubMenu);