Browse Source

ffserver: fix incorrect strlcpy usage

Somewhat ironic that this "safe" interface is actually being used
unsafely here. This fixes the usage preventing potential null pointer
dereference, where the old code was doubly broken: ctime can return
NULL, and ctime can return an arbitrarily long buffer.

Reviewed-by: Mark Harris <mark.hsj@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
tags/n3.0
Ganesh Ajjanagadde 10 years ago
parent
commit
6c2dbff7f0
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      ffserver.c

+ 6
- 2
ffserver.c View File

@@ -305,15 +305,19 @@ static void ffm_set_write_index(AVFormatContext *s, int64_t pos,
ffm->file_size = file_size;
}

static char *ctime1(char *buf2, int buf_size)
static char *ctime1(char *buf2, size_t buf_size)
{
time_t ti;
char *p;

ti = time(NULL);
p = ctime(&ti);
if (!p || !*p) {
*buf2 = '\0';
return buf2;
}
av_strlcpy(buf2, p, buf_size);
p = buf2 + strlen(p) - 1;
p = buf2 + strlen(buf2) - 1;
if (*p == '\n')
*p = '\0';
return buf2;


Loading…
Cancel
Save