Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 17:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

windres: don't exit so much on errors in read_coff_rsrc

Browse Source 
windres code has the habit of exiting on any error.  That's not so
bad, but it does make oss-fuzz ineffective when testing windres.  Fix
many places that print errors and exit to instead print the error and
pass status up the call chain.  In the process of doing this, I
noticed write_res_file was calling bfd_close without checking return
status.  Fixing that resulted in lots of testsuite failures.  The
problem was a lack of bfd_set_format in windres_open_as_binary, which
leaves the output file as bfd_unknown format.  As it happens this
doesn't make any difference in writing the output binary file, except
for the bfd_close return status.
This commit is contained in:
Alan Modra
2025-04-14 19:11:53 +09:30
parent 4846e543de
commit 9e68cae4fd
6 changed files with 549 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
binutils/resres.c
View File

@@ -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);