Check the return value of sscanf as it can return -1(EOF), for example
when the first char in the line is 0x00
---
libavformat/ffmetadec.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c
index 45c92f1ff6..0ea89fe3f3 100644
--- a/libavformat/ffmetadec.c
+++ b/libavformat/ffmetadec.c
@@ -101,19 +101,22 @@ static AVChapter *read_chapter(AVFormatContext *s)
uint8_t line[256];
int64_t start, end;
AVRational tb = {1, 1e9};
+ int ret;
get_line(s->pb, line, sizeof(line));
if (sscanf(line, "TIMEBASE=%d/%d", &tb.num, &tb.den))
get_line(s->pb, line, sizeof(line));
- if (!sscanf(line, "START=%"SCNd64, &start)) {
+ ret = sscanf(line, "START=%"SCNd64, &start);
+ if (ret <= 0) {
av_log(s, AV_LOG_ERROR, "Expected chapter start timestamp, found
%s.\n", line);
start = (s->nb_chapters && s->chapters[s->nb_chapters - 1]->end !=
AV_NOPTS_VALUE) ?
s->chapters[s->nb_chapters - 1]->end : 0;
} else
get_line(s->pb, line, sizeof(line));
- if (!sscanf(line, "END=%"SCNd64, &end)) {
+ ret = sscanf(line, "END=%"SCNd64, &end);
+ if (ret <= 0) {
av_log(s, AV_LOG_ERROR, "Expected chapter end timestamp, found %s.\n",
line);
end = AV_NOPTS_VALUE;
}
--
2.28.0.297.g1956fa8f8d-goog
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
