From: Alex Smith <ais523@nethack4.org>
Date: Tue, 1 Mar 2022 13:23:10 +0000 (+0000)
Subject: Avoid panic on zero-byte writes to save files
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d63b59e6a198a8848f7fe8f388dee2ea97f7642d;p=nethack

Avoid panic on zero-byte writes to save files

This is a well-defined operation, so bwrite() should be able to
handle it. However, when running under glibc, fwrite() produces an
unexpected return value for 0-byte writes, which makes bwrite()
think that the write failed (causing a panic).

This change implements 0-byte writes by not calling into libc at
all, so that we don't have to worry about how to decode the return
value of fwrite().
---

diff --git a/src/sfstruct.c b/src/sfstruct.c
index 1dcd427b8..73ebe28bf 100644
--- a/src/sfstruct.c
+++ b/src/sfstruct.c
@@ -172,6 +172,13 @@ bwrite(int fd, const genericptr_t loc, unsigned num)
     int idx = getidx(fd, NOFLG);
 
     if (idx >= 0) {
+        if (num == 0) {
+            /* nothing to do; we need a special case to exit early
+               because glibc fwrite doesn't give reliable
+               success/failure indication when writing 0 bytes */
+            return;
+        }
+
 #ifdef USE_BUFFERING
         if (bw_buffered[idx] && bw_FILE[idx]) {
             failed = (fwrite(loc, (int) num, 1, bw_FILE[idx]) != 1);