generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

src_movie: fix scanf string

Browse Source 
Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-05 00:56:39 +02:00
parent 369a120826
commit adaa7743f5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/src_movie.c
View File

@ -92,13 +92,13 @@ static int movie_request_frame(AVFilterLink *outlink);
static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec)
{ {
int i, ret, already = 0, stream_id = -1; int i, ret, already = 0, stream_id = -1;
char type_char, dummy; char type_char[2], dummy;
AVStream *found = NULL; AVStream *found = NULL;
enum AVMediaType type; enum AVMediaType type;
ret = sscanf(spec, "d%[av]%d%c", &type_char, &stream_id, &dummy); ret = sscanf(spec, "d%1[av]%d%c", type_char, &stream_id, &dummy);
if (ret >= 1 && ret <= 2) { if (ret >= 1 && ret <= 2) {
type = type_char == 'v' ? AVMEDIA_TYPE_VIDEO : AVMEDIA_TYPE_AUDIO; type = type_char[0] == 'v' ? AVMEDIA_TYPE_VIDEO : AVMEDIA_TYPE_AUDIO;
ret = av_find_best_stream(avf, type, stream_id, -1, NULL, 0); ret = av_find_best_stream(avf, type, stream_id, -1, NULL, 0);
if (ret < 0) { if (ret < 0) {
av_log(log, AV_LOG_ERROR, "No %s stream with index '%d' found\n", av_log(log, AV_LOG_ERROR, "No %s stream with index '%d' found\n",