1 files changed, 32 insertions, 10 deletions

diff --git a/binutils/resres.c b/binutils/resres.c
index ab5aa66..d96fb14 100644
--- a/binutils/resres.c
+++ b/binutils/resres.c
@@ -109,14 +109,14 @@ read_res_file (const char *fn)
 }
 
 /* Write resource file */
-void
+bool
 write_res_file (const char *fn,const rc_res_directory *resdir)
 {
   asection *sec;
   rc_uint_type language;
   bfd *abfd;
   windres_bfd wrbfd;
-  unsigned long sec_length = 0,sec_length_wrote;
+  rc_uint_type sec_length = 0, sec_length_wrote;
   static const bfd_byte sign[] =
   {0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
    0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
@@ -130,7 +130,10 @@ write_res_file (const char *fn,const rc_res_directory *resdir)
 				     (SEC_HAS_CONTENTS | SEC_ALLOC
 				      | SEC_LOAD | SEC_DATA));
   if (sec == NULL)
-    bfd_fatal ("bfd_make_section");
+    {
+      bfd_nonfatal ("bfd_make_section");
+      return false;
+    }
   /* Requiring this is probably a bug in BFD.  */
   sec->output_section = sec;
 
@@ -142,8 +145,13 @@ write_res_file (const char *fn,const rc_res_directory *resdir)
   sec_length = write_res_directory ((windres_bfd *) NULL, 0x20UL, resdir,
 				    (const rc_res_id *) NULL,
 				    (const rc_res_id *) NULL, &language, 1);
+  if (sec_length == (rc_uint_type) -1)
+    return false;
   if (!bfd_set_section_size (sec, (sec_length + 3) & ~3))
-    bfd_fatal ("bfd_set_section_size");
+    {
+      bfd_nonfatal ("bfd_set_section_size");
+      return false;
+    }
   if ((sec_length & 3) != 0)
     set_windres_bfd_content (&wrbfd, sign, sec_length, 4-(sec_length & 3));
   set_windres_bfd_content (&wrbfd, sign, 0, sizeof (sign));
@@ -152,12 +160,16 @@ write_res_file (const char *fn,const rc_res_directory *resdir)
 					  (const rc_res_id *) NULL,
 					  (const rc_res_id *) NULL,
 					  &language, 1);
+  if (sec_length_wrote == (rc_uint_type) -1)
+    return false;
   if (sec_length != sec_length_wrote)
-    fatal ("res write failed with different sizes (%lu/%lu).",
-	   (unsigned long) sec_length, (unsigned long) sec_length_wrote);
+    {
+      non_fatal ("res write failed with different sizes (%lu/%lu).",
+		 (unsigned long) sec_length, (unsigned long) sec_length_wrote);
+      return false;
+    }
 
-  bfd_close (abfd);
-  return;
+  return bfd_close (abfd);
 }
 
 /* Read a resource entry, returns 0 when all resources are read */
@@ -252,8 +264,12 @@ write_res_directory (windres_bfd *wrbfd, rc_uint_type off, const rc_res_director
 	}
 
       if (re->subdir)
-	off = write_res_directory (wrbfd, off, re->u.dir, type, name, language,
-				   level + 1);
+	{
+	  off = write_res_directory (wrbfd, off, re->u.dir, type, name, language,
+				     level + 1);
+	  if (off == (rc_uint_type) -1)
+	    return off;
+	}
       else
 	{
 	  if (level == 3)
@@ -265,12 +281,16 @@ write_res_directory (windres_bfd *wrbfd, rc_uint_type off, const rc_res_director
 	         resource itself records if anything.  */
 	      off = write_res_resource (wrbfd, off, type, name, re->u.res,
 	      				language);
+	      if (off == (rc_uint_type) -1)
+		return off;
 	    }
 	  else
 	    {
 	      fprintf (stderr, "// Resource at unexpected level %d\n", level);
 	      off = write_res_resource (wrbfd, off, type, (rc_res_id *) NULL,
 	      				re->u.res, language);
+	      if (off == (rc_uint_type) -1)
+		return off;
 	    }
 	}
     }
@@ -378,6 +398,8 @@ write_res_bin (windres_bfd *wrbfd, rc_uint_type off, const rc_res_resource *res,
   rc_uint_type datasize = 0;
 
   noff = res_to_bin ((windres_bfd *) NULL, off, res);
+  if (noff == (rc_uint_type) -1)
+    return noff;
   datasize = noff - off;
 
   off = write_res_header (wrbfd, off, datasize, type, name, resinfo);