[oe] [meta-oe][PATCH] gd: Replace strncpy with memccpy to fix -Wstringop-truncation.

[Robert Yang]

On 06/20/2018 10:28 AM, Khem Raj wrote:
> On Tue, Jun 19, 2018 at 7:14 PM Robert Yang <liezhi.yang at windriver.com> wrote:
>>
>> Fixed:
>> git/src/gdft.c:1699:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
>>
>> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
>> ---
>>   ...gdft.c-Replace-strncpy-with-memccpy-to-fi.patch | 46 ++++++++++++++++++++++
>>   meta-oe/recipes-support/gd/gd_2.2.5.bb             |  1 +
>>   2 files changed, 47 insertions(+)
>>   create mode 100644 meta-oe/recipes-support/gd/gd/0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch
>>
>> diff --git a/meta-oe/recipes-support/gd/gd/0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch b/meta-oe/recipes-support/gd/gd/0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch
>> new file mode 100644
>> index 0000000..b175c44
>> --- /dev/null
>> +++ b/meta-oe/recipes-support/gd/gd/0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch
>> @@ -0,0 +1,46 @@
>> +From 85c7694a5cf34597909bdd1ca6931b0f99904c2e Mon Sep 17 00:00:00 2001
>> +From: Robert Yang <liezhi.yang at windriver.com>
>> +Date: Tue, 19 Jun 2018 00:40:49 -0700
>> +Subject: [PATCH] annotate.c/gdft.c: Replace strncpy with memccpy to fix
>> + -Wstringop-truncation.
>> +
>> +Fixed:
>> +git/src/gdft.c:1699:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
>> +
>> +Upstream-Status: Pending
>> +
> 
> could you also post this patch upstream and start a discussion?

Thanks, I will do it today.

// Robert

> 
> 
>> +Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
>> +---
>> + src/annotate.c | 2 +-
>> + src/gdft.c     | 2 +-
>> + 2 files changed, 2 insertions(+), 2 deletions(-)
>> +
>> +diff --git a/src/annotate.c b/src/annotate.c
>> +index 00aaf49..17df813 100644
>> +--- a/src/annotate.c
>> ++++ b/src/annotate.c
>> +@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
>> +                                       fprintf(stderr, "Font maximum length is 1024, %d given\n", font_len);
>> +                                       goto badLine;
>> +                               }
>> +-                              strncpy(font, st, font_len);
>> ++                              memcpy(font, st, font_len);
>> +                       }
>> +               } else if(!strcmp(st, "align")) {
>> +                       char *st = strtok(0, " \t\r\n");
>> +diff --git a/src/gdft.c b/src/gdft.c
>> +index 9fa8295..81dbe41 100644
>> +--- a/src/gdft.c
>> ++++ b/src/gdft.c
>> +@@ -1696,7 +1696,7 @@ static char * font_path(char **fontpath, char *name_list)
>> +               gdFree(path);
>> +               return "could not alloc full list of fonts";
>> +       }
>> +-      strncpy(fontlist, name_list, name_list_len);
>> ++      memcpy(fontlist, name_list, name_list_len);
>> +       fontlist[name_list_len] = 0;
>> +
>> +       /*
>> +--
>> +2.10.2
>> +
>> diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-oe/recipes-support/gd/gd_2.2.5.bb
>> index 63d9acf..62d0df0 100644
>> --- a/meta-oe/recipes-support/gd/gd_2.2.5.bb
>> +++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb
>> @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=07384b3aa2e0d39afca0d6c40286f545"
>>   DEPENDS = "freetype libpng jpeg zlib tiff"
>>
>>   SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \
>> +           file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \
>>             "
>>
>>   SRCREV = "8255231b68889597d04d451a72438ab92a405aba"
>> --
>> 2.10.2
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>