From b23c506cbd069dcab9c5e5d932047a6c6790de3e Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Thu, 10 Sep 2020 21:43:23 +0000 Subject: [PATCH] Enforce correct length of target string constraints in strncpy(). Clang did warn about these. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1438 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 5 +++++ config_gram.y | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fc31894..e42073b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-09-10 Joerg Wunsch + + * config_gram.y (K_DESC): Enforce correct length in strncpy() + * config_gram.y (K_MEMORY): (Dito.) + 2020-09-10 Joerg Wunsch * avrpart.c (avr_new_memtype): ensure page_size is at least 1 diff --git a/config_gram.y b/config_gram.y index d9f661a1..468706e5 100644 --- a/config_gram.y +++ b/config_gram.y @@ -672,7 +672,7 @@ part_parm : K_DESC TKN_EQUAL TKN_STRING { - strncpy(current_part->desc, $3->value.string, AVR_DESCLEN); + strncpy(current_part->desc, $3->value.string, AVR_DESCLEN - 1); current_part->desc[AVR_DESCLEN-1] = 0; free_token($3); } | @@ -1240,7 +1240,7 @@ part_parm : free_token($2); YYABORT; } - strncpy(current_mem->desc, $2->value.string, AVR_MEMDESCLEN); + strncpy(current_mem->desc, $2->value.string, AVR_MEMDESCLEN - 1); current_mem->desc[AVR_MEMDESCLEN-1] = 0; free_token($2); }