aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsmenu.m
diff options
context:
space:
mode:
Diffstat (limited to 'src/nsmenu.m')
-rw-r--r--src/nsmenu.m6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m
index cccecffb42..2cd626e131 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -426,7 +426,8 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
break;
else
continue;
- if (strncmp (previous_strings[i], SDATA (string), 10))
+ if (memcmp (previous_strings[i], SDATA (string),
+ min (10, SBYTES (string) + 1)))
break;
}
@@ -447,7 +448,8 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
break;
if (n < 100)
- strncpy (previous_strings[i/4], SDATA (string), 10);
+ memcpy (previous_strings[i/4], min (10, SBYTES (string) + 1),
+ SDATA (string));
wv = xmalloc_widget_value ();
wv->name = SSDATA (string);