pc+-file-reader, sys-file-reader: Fix misuses of zero as null pointer.

Found by Clang.
Reported by Friedrich Beckmann.
Bug #52045.

diff --git a/src/data/pc+-file-reader.c b/src/data/pc+-file-reader.c
index a608d2500c913f685a0467a4abbfb401d2a437da..cc80cd723b1d142876967f4225c949a715b6aa04 100644 (file)
--- a/src/data/pc+-file-reader.c
+++ b/src/data/pc+-file-reader.c
@@ -221,13 +221,13 @@ pcp_open (struct file_handle *fh)
   /* Fetch file size. */
   if (fstat (fileno (r->file), &s))
     {
-      pcp_error (ME, 0, _("%s: stat failed (%s)."),
+      pcp_error (r, 0, _("%s: stat failed (%s)."),
                  fh_get_file_name (r->fh), strerror (errno));
       goto error;
     }
   if (s.st_size > UINT_MAX)
     {
-      pcp_error (ME, 0, _("%s: file too large."), fh_get_file_name (r->fh));
+      pcp_error (r, 0, _("%s: file too large."), fh_get_file_name (r->fh));
       goto error;
     }
   r->file_size = s.st_size;

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index 8abfe10b689fda6ce24df8c7d916ee3618a37aa7..b2db755732311d6c6ba8dda47044225edffa80c2 100644 (file)
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -3504,7 +3504,7 @@ read_ztrailer (struct sfm_reader *r,
 
   if (fstat (fileno (r->file), &s))
     {
-      sys_error (ME, 0, _("%s: stat failed (%s)."),
+      sys_error (r, 0, _("%s: stat failed (%s)."),
                  fh_get_file_name (r->fh), strerror (errno));
       return false;
     }