This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Prevent alpha_vms_object_p stopping bfd_check_format_matches scan
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Date: Fri, 29 Aug 2014 10:48:50 +0930
- Subject: Prevent alpha_vms_object_p stopping bfd_check_format_matches scan
- Authentication-results: sourceware.org; auth=none
Found last night when looking at that srec segfault.
Any error other than bfd_error_wrong_format returned from object_p()
is effectively a fatal error.
* vms-alpha.c (alpha_vma_object_p): Don't return file_truncated
error. Remove redundant bfd_set_error.
diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c
index f62d324..b7b8526 100644
--- a/bfd/vms-alpha.c
+++ b/bfd/vms-alpha.c
@@ -2474,10 +2474,7 @@ alpha_vms_object_p (bfd *abfd)
PRIV (recrd.rec) = buf;
if (bfd_bread (buf, test_len, abfd) != test_len)
- {
- bfd_set_error (bfd_error_file_truncated);
- goto error_ret;
- }
+ goto err_wrong_format;
/* Is it an image? */
if ((bfd_getl32 (buf) == EIHD__K_MAJORID)
@@ -2502,7 +2499,6 @@ alpha_vms_object_p (bfd *abfd)
if (buf == NULL)
{
PRIV (recrd.buf) = NULL;
- bfd_set_error (bfd_error_no_memory);
goto error_ret;
}
PRIV (recrd.buf) = buf;
@@ -2517,10 +2513,7 @@ alpha_vms_object_p (bfd *abfd)
while (remaining > 0)
{
if (bfd_bread (buf + read_so_far, to_read, abfd) != to_read)
- {
- bfd_set_error (bfd_error_file_truncated);
- goto err_wrong_format;
- }
+ goto err_wrong_format;
read_so_far += to_read;
remaining -= to_read;
--
Alan Modra
Australia Development Lab, IBM