wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-03 14:33:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

chargen: Make sure to check target buffer size

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2016-12-05 08:37:41 +01:00
parent 146685c2c2
commit 1dc67acd40
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/chargen.c
+13 -6
View File
@@ -30,25 +30,32 @@
#define NAME "chargen"
#define PATTERN "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ "
static char *generator(char *buf, size_t len)
static char *generator(char *buf, size_t buflen)
{
size_t num;
size_t num, len, width = 72;
static size_t pos = 0;
const char pattern[] = PATTERN;
len = 72;
if (buflen < width)
width = buflen;
len = width;
if (len + 3 > buflen)
len = buflen - 3;
if (pos + len > sizeof(pattern)) {
num = sizeof(pattern) - pos;
len -= num;
} else {
num = 72;
num = width;
if (num + 3 > buflen)
num = buflen - 3;
len = 0;
}
strncpy(&buf[0], &pattern[pos], num--);
strncpy(buf, &pattern[pos], num--);
if (len++)
strncpy(&buf[num], pattern, len);
strcat(buf, "\r\n");
strlcat(buf, "\r\n", width);
if (++pos >= sizeof(pattern) - 1)
pos = 0;