vim: src/menu.c comparison

updated for version 7.0-054

comparison

equal deleted inserted replaced

-:6632670ff6fc
+:03c4ceec6bec
 {
 	/* Get name of this element in the menu hierarchy, and the simplified
 	 * name (without mnemonic and accelerator text). */
 	next_name = menu_name_skip(name);
 	dname = menu_text(name, NULL, NULL);
+	if (dname == NULL)
+	    goto erret;
+	if (*dname == NUL)
+	{
+	    /* Only a mnemonic or accelerator is not valid. */
+	    EMSG(_("E792: Empty menu name"));
+	    goto erret;
+	}
 	/* See if it's already there */
 	lower_pri = menup;
 #ifdef FEAT_GUI
 	idx = 0;
 	menup = &menu->children;
 	parent = menu;
 	name = next_name;
 	vim_free(dname);
+	dname = NULL;
 	if (pri_tab[pri_idx + 1] != -1)
 	    ++pri_idx;
 }
 vim_free(path_name);
 return OK;
 erret:
 vim_free(path_name);
 vim_free(dname);
+/* Delete any empty submenu we added before discovering the error.  Repeat
+* for higher levels. */
+while (parent != NULL && parent->children == NULL)
+{
+	if (parent->parent == NULL)
+	    menup = &root_menu;
+	else
+	    menup = &parent->parent->children;
+	for ( ; *menup != NULL && *menup != parent; menup = &((*menup)->next))
+	    ;
+	if (*menup == NULL) /* safety check */
+	    break;
+	parent = parent->parent;
+	free_menu(menup);
+}
 return FAIL;
 }
 /*
 * Set the (sub)menu with the given name to enabled or disabled.

Mercurial > vim