From: Pedro Alves <palves@redhat.com>
Date: Thu, 19 Oct 2017 17:12:03 +0000 (+0100)
Subject: Fix build breakage in gdb/xml-support.c
X-Git-Tag: users/gbenson/thread_db-test/2017-11-22~395
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63929e843d54d327676bed4d86dad280f4675547;p=thirdparty%2Fbinutils-gdb.git

Fix build breakage in gdb/xml-support.c

The buildbots are showing that the previous change to
xml_fetch_content_from_file causes __wur warnings/errors:

  ../../binutils-gdb/gdb/xml-support.c: In function gdb::unique_xmalloc_ptr<char> xml_fetch_content_from_file(const char*, void*):
  ../../binutils-gdb/gdb/xml-support.c:1028:43: error: ignoring return value of size_t fread(void*, size_t, size_t, FILE*), declared with attribute warn_unused_result [-Werror=unused-result]
     fread (text.get (), 1, len, file.get ());
					     ^

This commit fixes it.

gdb/ChangeLog:
2017-10-19  Pedro Alves  <palves@redhat.com>

	* xml-support.c (xml_fetch_content_from_file): Check fread's
	return.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6625a03f5d4..aaf04850482 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-19  Pedro Alves  <palves@redhat.com>
+
+	* xml-support.c (xml_fetch_content_from_file): Check fread's
+	return.
+
 2017-10-19  Pedro Alves  <palves@redhat.com>
 
 	* ser-base.c (ser_base_read_error_fd): Delete the file handler if
diff --git a/gdb/xml-support.c b/gdb/xml-support.c
index 1f53d7af54c..2b59180c92c 100644
--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -1025,8 +1025,8 @@ xml_fetch_content_from_file (const char *filename, void *baton)
 
   gdb::unique_xmalloc_ptr<char> text ((char *) xmalloc (len + 1));
 
-  fread (text.get (), 1, len, file.get ());
-  if (ferror (file.get ()))
+  if (fread (text.get (), 1, len, file.get ()) != len
+      || ferror (file.get ()))
     {
       warning (_("Read error from \"%s\""), filename);
       return NULL;