From: Johannes Sixt <j6t@kdbg.org>
Date: Fri, 05 Aug 2016 05:40:48 GMT
Subject: Re: [PATCH 2/2] nedmalloc: work around overzealous GCC 6 warning
Message-ID: <68c24062-7fcc-758f-373f-2f123c5eb78b@kdbg.org>
In-Reply-To: <5ce2ec67-aa7d-0079-54fe-d73a70a46825@kdbg.org>

Am 05.08.2016 um 07:36 schrieb Johannes Sixt:
> Am 05.08.2016 um 00:39 schrieb Junio C Hamano:
>> @@ -955,12 +955,10 @@ void **nedpindependent_comalloc(nedpool *p,
>> size_t elems, size_t *sizes, void **
>>   */
>>  char *strdup(const char *s1)
>>  {
>> -    char *s2 = 0;
>> -    if (s1) {
>> -        size_t len = strlen(s1) + 1;
>> -        s2 = malloc(len);
>> +    size_t len = strlen(s1) + 1;
>> +    s2 = malloc(len);
>> +    if (s1)
>
> It does not make sense to check s1 for NULL when it was passed to
> strlen() earlier; strlen() does not accept NULL, either...

Oh! This is a typo. You meant to check s2 for NULL.

And the declaration for s2 should remain, of course.

>
>>          memcpy(s2, s1, len);
>> -    }
>>      return s2;
>>  }
>>  #endif

-- Hannes