diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-06-26 11:50:57 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-06-26 11:50:57 +0000 |
| commit | 1041d51366657c1b57e4154a8470d95998a1dfbe (patch) | |
| tree | 0ee9e822b04ad737bb34fe4a873055bdbdb612e5 | |
| parent | 996810e8d1f54a62cad5e4c6f0ca03e9146b90fe (diff) | |
* builtins.c (expand_builtin, maybe_emit_chk_warning): Handle
BUILT_IN_STRNCAT_CHK.
* gcc.dg/builtin-strncat-chk-1.c: New test.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_1-branch@126025 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/builtins.c | 22 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/builtin-strncat-chk-1.c | 38 |
4 files changed, 69 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7854ece4b08..15942179977 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2006-10-23 Jakub Jelinek <jakub@redhat.com> + + * builtins.c (expand_builtin, maybe_emit_chk_warning): Handle + BUILT_IN_STRNCAT_CHK. + 2006-09-16 Andrew Pinski <pinskia@physics.uc.edu> PR tree-opt/29059 diff --git a/gcc/builtins.c b/gcc/builtins.c index 6189bed811d..614eba1a036 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -6573,6 +6573,7 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, case BUILT_IN_STPCPY_CHK: case BUILT_IN_STRNCPY_CHK: case BUILT_IN_STRCAT_CHK: + case BUILT_IN_STRNCAT_CHK: case BUILT_IN_SNPRINTF_CHK: case BUILT_IN_VSNPRINTF_CHK: maybe_emit_chk_warning (exp, fcode); @@ -10428,6 +10429,11 @@ maybe_emit_chk_warning (tree exp, enum built_in_function fcode) arg_mask = 6; is_strlen = 1; break; + case BUILT_IN_STRNCAT_CHK: + /* For __strncat_chk the warning will be emitted only if overflowing + by at least strlen (dest) + 1 bytes. */ + arg_mask = 12; + break; case BUILT_IN_STRNCPY_CHK: arg_mask = 12; break; @@ -10465,6 +10471,22 @@ maybe_emit_chk_warning (tree exp, enum built_in_function fcode) if (! len || ! host_integerp (len, 1) || tree_int_cst_lt (len, size)) return; } + else if (fcode == BUILT_IN_STRNCAT_CHK) + { + tree src = TREE_VALUE (TREE_CHAIN (arglist)); + if (! src || ! host_integerp (len, 1) || tree_int_cst_lt (len, size)) + return; + src = c_strlen (src, 1); + if (! src || ! host_integerp (src, 1)) + { + locus = EXPR_LOCATION (exp); + warning (0, "%Hcall to %D might overflow destination buffer", + &locus, get_callee_fndecl (exp)); + return; + } + else if (tree_int_cst_lt (src, size)) + return; + } else if (! host_integerp (len, 1) || ! tree_int_cst_lt (size, len)) return; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7d64aa1b611..134c2239fa0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2006-10-23 Jakub Jelinek <jakub@redhat.com> + + * gcc.dg/builtin-strncat-chk-1.c: New test. + 2006-09-16 Andrew Pinski <pinskia@physics.uc.edu> PR tree-opt/29059 diff --git a/gcc/testsuite/gcc.dg/builtin-strncat-chk-1.c b/gcc/testsuite/gcc.dg/builtin-strncat-chk-1.c new file mode 100644 index 00000000000..80d7b9d6ebf --- /dev/null +++ b/gcc/testsuite/gcc.dg/builtin-strncat-chk-1.c @@ -0,0 +1,38 @@ +/* Test whether buffer overflow warnings for __strncat_chk builtin + are emitted properly. */ +/* { dg-do compile } */ +/* { dg-options "-O2 -std=gnu99" } */ + +extern void abort (void); + +#include "../gcc.c-torture/execute/builtins/chk.h" + +char buf1[20]; +char *q; + +void +test (int arg, ...) +{ + char *p = &buf1[10]; + + *p = 0; + strncat (p, "abcdefg", 9); + *p = 0; + strncat (p, "abcdefghi", 9); + *p = 0; + strncat (p, "abcdefghij", 9); + *p = 0; + strncat (p, "abcdefghi", 10); + *p = 0; + strncat (p, "abcdefghij", 10); /* { dg-warning "will always overflow" } */ + *p = 0; + strncat (p, "abcdefgh", 11); + *p = 0; + strncat (p, "abcdefghijkl", 11); /* { dg-warning "will always overflow" } */ + *p = 0; + strncat (p, q, 9); + *p = 0; + strncat (p, q, 10); /* { dg-warning "might overflow" } */ + *p = 0; + strncat (p, q, 11); /* { dg-warning "might overflow" } */ +} |