[PATCH] Fix undefined behaviour inconsistent for strtok

Adhemerval Zanella adhemerval.zanella@linaro.org
Tue Oct 25 12:33:00 GMT 2016



On 25/10/2016 09:31, Andreas Schwab wrote:
> On Okt 25 2016, Adhemerval Zanella <adhemerval.zanella@linaro.org> wrote:
> 
>> 	* string/strtok.c (strtok): Return null is previous input is also
> 
> s/is/if/
> 
>> diff --git a/string/strtok.c b/string/strtok.c
>> index 7a4574d..5c4b309 100644
>> --- a/string/strtok.c
>> +++ b/string/strtok.c
>> @@ -40,8 +40,8 @@ STRTOK (char *s, const char *delim)
>>  {
>>    char *token;
>>  
>> -  if (s == NULL)
>> -    s = olds;
>> +  if ((s == NULL) && ((s = olds) == NULL))
> 
> Please avoid assignment in an expression.  And the parens are redundant.
> 
> Andreas.
> 

Right, with these fixes would it be acceptable?



More information about the Libc-alpha mailing list