* Comment bfd_get_section_limit_octets and bfd_get_section_alloc_size
@ 2022-12-18 10:12 Alan Modra
0 siblings, 0 replies; only message in thread
From: Alan Modra @ 2022-12-18 10:12 UTC (permalink / raw)
To: binutils
* bfd.c (bfd_get_section_limit_octets): Add comment.
(bfd_get_section_alloc_size): Likewise.
* libbfd.c (_bfd_generic_get_section_contents): Use
bfd_get_section_limit_octets.
* section.c (bfd_get_section_contents): Likewise.
* bfd-in2.h: Regenerate.
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index f4d531f5bf8..053eccf2837 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -6946,6 +6946,8 @@ bfd_set_asymbol_name (asymbol *sy, const char *name)
sy->name = name;
}
+/* For input sections return the original size on disk of the
+ section. For output sections return the current size. */
static inline bfd_size_type
bfd_get_section_limit_octets (const bfd *abfd, const asection *sec)
{
@@ -6962,6 +6964,9 @@ bfd_get_section_limit (const bfd *abfd, const asection *sec)
/ bfd_octets_per_byte (abfd, sec));
}
+/* For input sections return the larger of the current size and the
+ original size on disk of the section. For output sections return
+ the current size. */
static inline bfd_size_type
bfd_get_section_alloc_size (const bfd *abfd, const asection *sec)
{
diff --git a/bfd/bfd.c b/bfd/bfd.c
index 97ce2b10450..e1759ed670e 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -502,6 +502,8 @@ CODE_FRAGMENT
. sy->name = name;
.}
.
+.{* For input sections return the original size on disk of the
+. section. For output sections return the current size. *}
.static inline bfd_size_type
.bfd_get_section_limit_octets (const bfd *abfd, const asection *sec)
.{
@@ -518,6 +520,9 @@ CODE_FRAGMENT
. / bfd_octets_per_byte (abfd, sec));
.}
.
+.{* For input sections return the larger of the current size and the
+. original size on disk of the section. For output sections return
+. the current size. *}
.static inline bfd_size_type
.bfd_get_section_alloc_size (const bfd *abfd, const asection *sec)
.{
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index d33f3416206..0026c377862 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -943,15 +943,7 @@ _bfd_generic_get_section_contents (bfd *abfd,
return false;
}
- /* We do allow reading of a section after bfd_final_link has
- written the contents out to disk. In that situation, rawsize is
- just a stale version of size, so ignore it. Otherwise we must be
- reading an input section, where rawsize, if different to size,
- is the on-disk size. */
- if (abfd->direction != write_direction && section->rawsize != 0)
- sz = section->rawsize;
- else
- sz = section->size;
+ sz = bfd_get_section_limit_octets (abfd, section);
if (offset + count < count
|| offset + count > sz
|| (abfd->my_archive != NULL
diff --git a/bfd/section.c b/bfd/section.c
index a49778eb333..893fc91b3df 100644
--- a/bfd/section.c
+++ b/bfd/section.c
@@ -1550,10 +1550,7 @@ bfd_get_section_contents (bfd *abfd,
return true;
}
- if (abfd->direction != write_direction && section->rawsize != 0)
- sz = section->rawsize;
- else
- sz = section->size;
+ sz = bfd_get_section_limit_octets (abfd, section);
if ((bfd_size_type) offset > sz
|| count > sz - offset
|| count != (size_t) count)
--
Alan Modra
Australia Development Lab, IBM
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-12-18 10:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-18 10:12 Comment bfd_get_section_limit_octets and bfd_get_section_alloc_size Alan Modra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).