[PATCH] Fix crashes on invalid input in IBM gconv modules [BZ #17325]

[Allan McRae]

On 30/08/14 00:32, 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?
> 

I am OK with this, once there is an ack to use __builtin_expect instead
of __glibc_likely.

I agree with you that the cleanup of all the  __builtin_expect should
happen in a following patch so the change is minimal at this stage and
easy to backport.

Allan