cryb.to/cryb-to
1
0
Fork 0
mirror of https://github.com/cryb-to/cryb-to.git synced 2024-11-25 15:15:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a check for buffer overflow

Browse source
This commit is contained in:
Dag-Erling Smørgrav 2014-07-13 21:33:46 +00:00 committed by des
parent f1907404b1
commit 6be7e6da5f
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
t/t_strlcat.c
View file

@ -45,6 +45,7 @@
#define T_MAGIC_STR "squeamish ossifrage" #define T_MAGIC_STR "squeamish ossifrage"
#define T_MAGIC_LEN (sizeof(T_MAGIC_STR) - 1) #define T_MAGIC_LEN (sizeof(T_MAGIC_STR) - 1)
#define T_BUFSIZE (T_MAGIC_LEN + 1 + T_MAGIC_LEN + 1) #define T_BUFSIZE (T_MAGIC_LEN + 1 + T_MAGIC_LEN + 1)
#define T_CANARY 0x7f
struct t_case { struct t_case {
const char *desc; const char *desc;
@ -130,12 +131,17 @@ static int
t_strlcat(char **desc CRYB_UNUSED, void *arg) t_strlcat(char **desc CRYB_UNUSED, void *arg)
{ {
struct t_case *t = arg; struct t_case *t = arg;
char buf[T_BUFSIZE]; char buf[T_BUFSIZE + 1];
size_t sz; size_t sz;
int ret; int ret;
memcpy(buf, t->buf, sizeof buf); memcpy(buf, t->buf, sizeof t->buf);
sz = strlcat(buf, t->in, sizeof buf); buf[T_BUFSIZE] = T_CANARY;
sz = strlcat(buf, t->in, T_BUFSIZE);
if (buf[T_BUFSIZE] != T_CANARY) {
t_verbose("buffer overflow");
return (0);
}
ret = t_compare_sz(t->sz, sz); ret = t_compare_sz(t->sz, sz);
if (t->out != NULL) if (t->out != NULL)
ret = ret && t_compare_str(t->out, buf); ret = ret && t_compare_str(t->out, buf);