diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-03 19:05:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 18:28:33 +0100 |
| commit | bb70b6673f94f319cd791aadfa9d1f881a657eb5 (patch) | |
| tree | 25a17b74297501af27fec3e3881890f9b58c9318 | |
| parent | a07dfcdd6d72768696e6572f4d614d63a68f4969 (diff) | |
| download | ffmpeg-bb70b6673f94f319cd791aadfa9d1f881a657eb5.tar.gz | |
avformat/aviobuf: Fix infinite loop in ff_get_line()
Fixes ticket4152
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit eac5c7b8377f3f0e8262ab44e5ccb2c7ed060cdd)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/aviobuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 738459e830..8955825d87 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -666,7 +666,7 @@ int ff_get_line(AVIOContext *s, char *buf, int maxlen) if (c && i < maxlen-1) buf[i++] = c; } while (c != '\n' && c != '\r' && c); - if (c == '\r' && avio_r8(s) != '\n') + if (c == '\r' && avio_r8(s) != '\n' && !url_feof(s)) avio_skip(s, -1); buf[i] = 0; |