This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] Fix crashes on invalid input in IBM gconv modules [BZ #17325]
- From: OndÅej BÃlka <neleai at seznam dot cz>
- To: Florian Weimer <fweimer at redhat dot com>
- Cc: Andreas Schwab <schwab at linux-m68k dot org>, GNU C Library <libc-alpha at sourceware dot org>, azanella at linux dot vnet dot ibm dot com, Allan McRae <allan at archlinux dot org>
- Date: Sat, 30 Aug 2014 13:45:31 +0200
- Subject: Re: [PATCH] Fix crashes on invalid input in IBM gconv modules [BZ #17325]
- Authentication-results: sourceware.org; auth=none
- References: <54006E57 dot 8030800 at redhat dot com> <87y4u7o1yr dot fsf at igel dot home> <54008EF8 dot 7030507 at redhat dot com>
On Fri, Aug 29, 2014 at 04:32:24PM +0200, Florian Weimer wrote:
> On 08/29/2014 03:33 PM, Andreas Schwab wrote:
> >Florian Weimer <fweimer@redhat.com> writes:
> >
> >>+ if (__builtin_expect (rp2->start == 0xffff, 0) \
> >
> >Please use either this
> >
> >>+ if (__builtin_expect (ch == 0xffff, 0) \
> >
> >or this consistently.
>
> Oops, you are right. I went with the first variant, as in the original fix.
>
> Retested successfully.
>
> Allan, is this okay for master at this stage?
>
Anyway when we go for consistency wouldn't be better just use
libc_likely/unlikely?