From 6f8c36df70065f94feb23086dfacb412c0e7f811 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sat, 5 Oct 2024 10:54:54 -0400
Subject: [PATCH] copy_bytes() recover function

The version of copy_bytes() in util/recover.c had fallen behind
the internal version in files.c which had received some
analyzer changes in 4bc5e260823db78bc3feeea1770d5aa564af45db from
December 2022.

This synchronizes them, and addresses a couple of other static
analysis recommendations.
---
 src/files.c    |  3 ++-
 util/recover.c | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/files.c b/src/files.c
index e522bc4e0..d353093a1 100644
--- a/src/files.c
+++ b/src/files.c
@@ -4456,9 +4456,10 @@ boolean
 copy_bytes(int ifd, int ofd)
 {
     char buf[BUFSIZ];
-    int nfrom, nto = 0;
+    int nfrom, nto;
 
     do {
+        nto = 0;
         nfrom = read(ifd, buf, BUFSIZ);
         /* read can return -1 */
         if (nfrom >= 0 && nfrom <= BUFSIZ)
diff --git a/util/recover.c b/util/recover.c
index 08d8258c9..cd4cf80ff 100644
--- a/util/recover.c
+++ b/util/recover.c
@@ -201,9 +201,12 @@ copy_bytes(int ifd, int ofd)
     int nfrom, nto;
 
     do {
+        nto = 0;
         nfrom = read(ifd, buf, BUFSIZ);
-        nto = write(ofd, buf, nfrom);
-        if (nto != nfrom) {
+        /* read can return -1 */
+        if (nfrom >= 0 && nfrom <= BUFSIZ)
+            nto = write(ofd, buf, nfrom);
+        if (nto != nfrom || nfrom < 0) {
             Fprintf(stderr, "file copy failed!\n");
             exit(EXIT_FAILURE);
         }
@@ -333,6 +336,7 @@ restore_savefile(char *basename)
         return -1;
     }
 
+    assert((size_t) pltmpsiz <= sizeof plbuf);
     if (write(sfd, (genericptr_t) plbuf, pltmpsiz) != pltmpsiz) {
         Fprintf(stderr, "Error writing %s; recovery failed (player name).\n",
                 savename);
@@ -404,8 +408,8 @@ store_formatindicator(int fd)
     char indicate = 'h';      /* historical */
     int cmc = 0;
 
-    write(fd, (genericptr_t) &indicate, sizeof indicate);
-    write(fd, (genericptr_t) &cmc, sizeof cmc);
+    (void) write(fd, (genericptr_t) &indicate, sizeof indicate);
+    (void) write(fd, (genericptr_t) &cmc, sizeof cmc);
 }