From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 23 Sep 2017 17:40:10 +0000 (-0700)
Subject: pc+-file-reader, sys-file-reader: Fix misuses of zero as null pointer.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=850523d4cd0a281c4ad6b283585c69633b97c7c7

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 a608d2500c..cc80cd723b 100644
--- 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 8abfe10b68..b2db755732 100644
--- 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;
     }