From: Stan Shebs <shebs@codesourcery.com>
Date: Tue, 13 Apr 2010 03:53:50 +0000 (+0000)
Subject: 2010-04-12  Stan Shebs  <stan@codesourcery.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=523136f211c183f5e5c51adf00eb84cb838e7d0a;p=binutils-gdb.git

2010-04-12  Stan Shebs  <stan@codesourcery.com>

	* tracepoint.c (tfile_xfer_partial): Check read result.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 865768bea92..51cdaa6b4a2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-12  Stan Shebs  <stan@codesourcery.com>
+
+	* tracepoint.c (tfile_xfer_partial): Check read result.
+
 2010-04-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* remote-m32r-sdi.c (m32r_files_info): Add const to local "file" var.
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index d3160a9336f..82221826bdf 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -3892,7 +3892,14 @@ tfile_xfer_partial (struct target_ops *ops, enum target_object object,
 	      if (amt > len)
 		amt = len;
 
-	      read (trace_fd, readbuf, amt);
+	      gotten = read (trace_fd, readbuf, amt);
+	      if (gotten < 0)
+		perror_with_name (trace_filename);
+	      /* While it's acceptable to return less than was
+		 originally asked for, it's not acceptable to return
+		 less than what this block claims to contain.  */
+	      else if (gotten < amt)
+		error (_("Premature end of file while reading trace file"));
 	      return amt;
   	    }
 	  lseek (trace_fd, mlen, SEEK_CUR);