diff src/macmenu.c @ 48625:b696e2bae8da

2002-12-02 Andrew Choi <akochoi@shaw.ca> * macmenu.c (add_menu_item, fill_menubar): Truncate menu item names to 255 characters. * macterm.c (XTread_socket): If all frames have been collapsed, expand the first one before handling drag-and-drop events. * s/darwin.h (GETPGRP_NO_ARG): Delete. Replaced by GETPGRP_VOID, which is detected by autoconf.
author Andrew Choi <akochoi@shaw.ca>
date Mon, 02 Dec 2002 17:13:46 +0000
parents af8ff2a92902
children 3cabed8b65b7
line wrap: on
line diff
--- a/src/macmenu.c	Mon Dec 02 16:30:23 2002 +0000
+++ b/src/macmenu.c	Mon Dec 02 17:13:46 2002 +0000
@@ -2226,13 +2226,14 @@
 
       strcpy (item_name, "");
       for (i = 0; i < indent; i++)
-        strcat (item_name, "    ");
-      strcat (item_name, wv->name);
+	strncat (item_name, "    ", 255);
+      strncat (item_name, wv->name, 255);
       if (wv->key != NULL)
 	{
-	  strcat (item_name, " ");
-	  strcat (item_name, wv->key);
+	  strncat (item_name, " ", 255);
+	  strncat (item_name, wv->key, 255);
 	}
+      item_name[255] = 0;
       c2pstr (item_name);
       SetMenuItemText (menu, pos, item_name);
 
@@ -2316,7 +2317,8 @@
       MenuHandle menu;
       Str255 title;
         
-      strcpy (title, wv->name);
+      strncpy (title, wv->name, 255);
+      title[255] = 0;
       c2pstr (title);
       menu = NewMenu (id, title);