[OpenWrt-Devel] [PATCH 5/6] uclient-utils: Handle memory allocation failure for url file name

Tobias Schramm tobleminer at gmail.com
Sun Feb 18 16:51:50 EST 2018


Yep Philip, you are right. That's a much nicer solution.
I'll wait for some more feedback and do just that in v3.

2018-02-18 19:35 GMT+01:00 Philip Prindeville
<monster_philip at redfish-solutions.com>:
>
>
>> On Feb 17, 2018, at 8:36 PM, Tobias Schramm <tobleminer at gmail.com> wrote:
>>
>> Signed-off-by: Tobias Schramm <tobleminer at gmail.com>
>> ---
>> uclient-utils.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/uclient-utils.c b/uclient-utils.c
>> index a375eea..ee0f8e8 100644
>> --- a/uclient-utils.c
>> +++ b/uclient-utils.c
>> @@ -177,8 +177,12 @@ char *uclient_get_url_filename(const char *url, const char *default_name)
>>    str++;
>>    len -= str - url;
>>
>> -    if (len > 0)
>> -        return strncpy(calloc(1, len + 1), str, len);
>> +    if (len > 0) {
>
>
> Why not just use strndup() here instead?
>
> -Philip
>
>
>> +        char *fname = calloc(1, len + 1);
>> +        if(!fname)
>> +            return NULL;
>>
>> +        return strncpy(fname, str, len);
>> +    }
>>    return strdup(default_name);
>> }
>> --
>> 2.16.1
>> _______________________________________________
>> openwrt-devel mailing list
>> openwrt-devel at lists.openwrt.org
>> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
>
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


More information about the openwrt-devel mailing list