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

lavf/segment: remove silly assert(), improve feedback

Browse Source 
The code should not assert in case of invalid user input. Fails
gracefully instead.
This commit is contained in:
Stefano Sabatini 2012-12-09 20:39:27 +01:00
parent 68bc012190
commit ad47ac20ae
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/segment.c
View File

@ -29,7 +29,6 @@
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "libavutil/avassert.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
@ -274,13 +273,18 @@ static int parse_times(void *log_ctx, int64_t **times, int *nb_times,
for (i = 0; i < *nb_times; i++) { for (i = 0; i < *nb_times; i++) {
int64_t t; int64_t t;
char *tstr = av_strtok(p, ",", &saveptr); char *tstr = av_strtok(p, ",", &saveptr);
av_assert0(tstr);
p = NULL; p = NULL;
if (!tstr || !tstr[0]) {
av_log(log_ctx, AV_LOG_ERROR, "Empty time specification in times list %s\n",
times_str);
FAIL(AVERROR(EINVAL));
}
ret = av_parse_time(&t, tstr, 1); ret = av_parse_time(&t, tstr, 1);
if (ret < 0) { if (ret < 0) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"Invalid time duration specification in %s\n", p); "Invalid time duration specification '%s' in times list %s\n", tstr, times_str);
FAIL(AVERROR(EINVAL)); FAIL(AVERROR(EINVAL));
} }
(*times)[i] = t; (*times)[i] = t;