diff options
author | Po Lu <luangruo@yahoo.com> | 2023-05-15 10:38:10 +0800 |
---|---|---|
committer | Po Lu <luangruo@yahoo.com> | 2023-05-15 10:38:10 +0800 |
commit | a46e231a5f27c46933cc53865cee452ad1a0c0d3 (patch) | |
tree | 8694852f6b7fd201736cf48a0f72f139a9a76ff8 /lib-src | |
parent | 45ab9158cf1a94041ad65c66818dde56e7c1c43b (diff) | |
parent | ebf5e4ca1cd39d3f23c4e37d9bdfeb2bf347df6d (diff) | |
download | emacs-a46e231a5f27c46933cc53865cee452ad1a0c0d3.tar.gz |
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'lib-src')
-rw-r--r-- | lib-src/ebrowse.c | 5 | ||||
-rw-r--r-- | lib-src/movemail.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 371fa6c938b..4b71f7447e0 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -3767,8 +3767,9 @@ main (int argc, char **argv) if (n_input_files == input_filenames_size) { input_filenames_size = max (10, 2 * input_filenames_size); - input_filenames = (char **) xrealloc ((void *)input_filenames, - input_filenames_size); + input_filenames = xrealloc (input_filenames, + (input_filenames_size + * sizeof *input_filenames)); } input_filenames[n_input_files++] = xstrdup (optarg); break; diff --git a/lib-src/movemail.c b/lib-src/movemail.c index a71be8c2099..6a772e9043e 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -470,7 +470,7 @@ main (int argc, char **argv) that were set on the file. Better to just empty the file. */ if (unlink (inname) < 0 && errno != ENOENT) #endif /* MAIL_UNLINK_SPOOL */ - creat (inname, 0600); + close (creat (inname, 0600)); } #endif /* not MAIL_USE_SYSTEM_LOCK */ |