diff options
| author | Paul Eggert <[email protected]> | 2012-07-10 14:48:34 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2012-07-10 14:48:34 -0700 |
| commit | e99a530f8cdca3ccd9e739cd092ed9865d12fe89 (patch) | |
| tree | c2bef9f80ff9910be17757a83f61caed02146d0a /src/nsmenu.m | |
| parent | c59592b32f5b5808c12720bfd37ea73b473fa1db (diff) | |
Simplify by avoiding confusing use of strncpy etc.
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 6 |
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); |