X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2Flibaxwin3.so_src%2Fr_menu.c;h=9894abd05e6cf2a30d8c639db1983880d8453559;hb=32637a3bcd6e38425272f901745a76efa301afd5;hp=4b7bb56290ac7f53eca0bfd6e7ff4123d47d4442;hpb=f194730e75d6d3681e5f99a4efed1616fd1ea738;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 4b7bb562..9894abd0 100644
--- a/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_menu.c
+++ b/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_menu.c
@@ -43,9 +43,9 @@ int AxWin3_Menu_int_Callback(tHWND Window, int Message, int Length, void *Data)
 		if(msg->ID >= info->nItems)	return -1;
 		item = &info->Items[msg->ID];
 		if(item->Callback)	item->Callback(item->CbPtr);
-		return 0; }
+		return 1; }
 	}
-	return 1;
+	return 0;
 }
 
 tHWND AxWin3_Menu_Create(tHWND Parent)
@@ -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);