fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/io.c: Avoid use of memcpy()

Browse Source 
Use strncpy() and a proper limit, which ensures we never read more
characters than the buffer can hold. Also, ensure we always
null-terminate strings here.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-11-11 12:00:57 +01:00
parent 120f434967
commit 5e4db62662
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/io.c
View File

@ -2410,7 +2410,8 @@ ical_read_event (FILE *fdi, FILE *log, unsigned *noevents, unsigned *noapoints,
skip_alarm = 0; skip_alarm = 0;
while (ical_readline (fdi, buf, lstore, lineno)) while (ical_readline (fdi, buf, lstore, lineno))
{ {
memcpy (buf_upper, buf, strlen (buf)); strncpy (buf_upper, buf, BUFSIZ);
buf_upper[BUFSIZ - 1] = '\0';
str_toupper (buf_upper); str_toupper (buf_upper);
if (skip_alarm) if (skip_alarm)
@ -2594,7 +2595,8 @@ ical_read_todo (FILE *fdi, FILE *log, unsigned *notodos, unsigned *noskipped,
skip_alarm = 0; skip_alarm = 0;
while (ical_readline (fdi, buf, lstore, lineno)) while (ical_readline (fdi, buf, lstore, lineno))
{ {
memcpy (buf_upper, buf, strlen (buf)); strncpy (buf_upper, buf, BUFSIZ);
buf_upper[BUFSIZ - 1] = '\0';
str_toupper (buf_upper); str_toupper (buf_upper);
if (skip_alarm) if (skip_alarm)
{ {