diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-06-11 08:38:34 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-06-11 08:38:34 -0700 |
| commit | e17cda4942adf353fb7adc4bcdaa61a1ae79db8d (patch) | |
| tree | ff5f524568260a2823023c2a8e7dde84fc6ae1e0 /nt | |
| parent | ef744119a7cbd0692c53704604e9bb6345c371b6 (diff) | |
| parent | 758e9a8ed49c15f7069a67cf0c2ce3c6f9a3f7e1 (diff) | |
| download | emacs-e17cda4942adf353fb7adc4bcdaa61a1ae79db8d.tar.gz | |
Merge from origin/emacs-26
758e9a8 Revert "Don't mark main_thread (Bug#36155)"
1877b7b Don't mark main_thread (Bug#36155)
4904fb3 More quotation fixes (Bug#35885)
4cc4b5d ; * src/keyboard.c (tool_bar_items): Fix a typo. (Bug#36143)
b58ecaf Minor copyedits in efaq-w32
48422af Tiny improvement of documentation of major mode conventions
25d44d2 * nt/addpm.c (main): Fix buffer overflow
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/addpm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nt/addpm.c b/nt/addpm.c index f71ce5f2385..a8bcd4a5c73 100644 --- a/nt/addpm.c +++ b/nt/addpm.c @@ -219,8 +219,9 @@ main (int argc, char *argv[]) { int result; - char msg[ MAX_PATH ]; - sprintf (msg, "Install Emacs at %s?\n", emacs_path); + const char install_msg[] = "Install Emacs at %s?\n"; + char msg[ MAX_PATH + sizeof (install_msg) ]; + sprintf (msg, install_msg, emacs_path); result = MessageBox (NULL, msg, "Install Emacs", MB_OKCANCEL | MB_ICONQUESTION); if (result != IDOK) |