From: Stefan Liebler <stli@linux.ibm.com>
To: libc-alpha@sourceware.org
Cc: Stefan Liebler <stli@linux.ibm.com>
Subject: [PATCH] Fix stringop-overflow errors from gcc 10 in iconv.
Date: Tue, 16 Jun 2020 14:24:20 +0200 [thread overview]
Message-ID: <20200616122420.5175-1-stli@linux.ibm.com> (raw)
On s390x, I've recognize various -Werror=stringop-overflow messages
in iconv/loop.c and iconv/skeleton.c if build with gcc10 -O3.
With this commit gcc knows the size and do not raise those errors anymore.
---
iconv/loop.c | 14 ++++++++------
iconv/skeleton.c | 8 +++++---
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/iconv/loop.c b/iconv/loop.c
index 9f7570d591..b032fcd9ac 100644
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -420,8 +420,10 @@ SINGLE(LOOPFCT) (struct __gconv_step *step,
# else
/* We don't have enough input for another complete input
character. */
- while (inptr < inend)
- state->__value.__wchb[inlen++] = *inptr++;
+ size_t inlen_after = inlen + (inend - inptr);
+ assert (inlen_after <= sizeof (state->__value.__wchb));
+ for (; inlen < inlen_after; inlen++)
+ state->__value.__wchb[inlen] = *inptr++;
# endif
return __GCONV_INCOMPLETE_INPUT;
@@ -483,11 +485,11 @@ SINGLE(LOOPFCT) (struct __gconv_step *step,
/* We don't have enough input for another complete input
character. */
assert (inend - inptr > (state->__count & ~7));
- assert (inend - inptr <= sizeof (state->__value));
+ assert (inend - inptr <= sizeof (state->__value.__wchb));
state->__count = (state->__count & ~7) | (inend - inptr);
- inlen = 0;
- while (inptr < inend)
- state->__value.__wchb[inlen++] = *inptr++;
+ for (inlen = 0; inlen < inend - inptr; inlen++)
+ state->__value.__wchb[inlen] = inptr[inlen];
+ inptr = inend;
# endif
}
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index 1dc642e2fc..1a38b51a5a 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -795,11 +795,13 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
# else
/* Make sure the remaining bytes fit into the state objects
buffer. */
- assert (inend - *inptrp < 4);
+ size_t cnt_after = inend - *inptrp;
+ assert (cnt_after <= sizeof (data->__statep->__value.__wchb));
size_t cnt;
- for (cnt = 0; *inptrp < inend; ++cnt)
- data->__statep->__value.__wchb[cnt] = *(*inptrp)++;
+ for (cnt = 0; cnt < cnt_after; ++cnt)
+ data->__statep->__value.__wchb[cnt] = (*inptrp)[cnt];
+ *inptrp = inend;
data->__statep->__count &= ~7;
data->__statep->__count |= cnt;
# endif
--
2.25.0
next reply other threads:[~2020-06-16 12:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-16 12:24 Stefan Liebler [this message]
2020-06-26 7:52 ` Stefan Liebler
2020-06-26 18:00 ` Matheus Castanho
2020-07-06 14:30 ` Stefan Liebler
2020-07-06 15:03 ` Carlos O'Donell
2020-07-07 7:44 ` Stefan Liebler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200616122420.5175-1-stli@linux.ibm.com \
--to=stli@linux.ibm.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).