Check for eof before streaming rdbuf

2 files changed, 13 insertions, 3 deletions

diff --git a/bpkg/checksum.cxx b/bpkg/checksum.cxx
index 023e641..3f52204 100644
--- a/bpkg/checksum.cxx
+++ b/bpkg/checksum.cxx
@@ -330,7 +330,12 @@ namespace bpkg
       ifdstream is (pr.in_ofd, fdstream_mode::skip);
       ofdstream os (pr.out_fd);
 
-      os << &sb;
+      // Note that the eof check is important: if the stream is at eof, write
+      // will fail.
+      //
+      if (sb.sgetc () != ifdstream::traits_type::eof ())
+        os << &sb;
+
       os.close ();
 
       // All three tools output the sum as the first word.
diff --git a/bpkg/fetch.cxx b/bpkg/fetch.cxx
index 85d6583..1c9b623 100644
--- a/bpkg/fetch.cxx
+++ b/bpkg/fetch.cxx
@@ -578,9 +578,14 @@ namespace bpkg
       // the manifest parsing.
       //
       ifdstream is (pr.in_ofd, fdstream_mode::binary);
-
       stringstream bs (ios::in | ios::out | ios::binary);
-      bs << is.rdbuf ();
+
+      // Note that the eof check is important: if the stream is at eof, write
+      // will fail.
+      //
+      if (is.peek () != ifdstream::traits_type::eof ())
+        bs << is.rdbuf ();
+
       is.close ();
 
       string sha256sum (sha256 (o, bs));