summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-20 17:13:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-10 02:13:12 +0200
commit9dd9090b89d57451740fe8d2d49082b1152d2928 (patch)
tree76d33470e97ec2a7b88a344a6c38b034f8805a50
parentfd1be2bd874c1979d45f471165b1b76af2cde45f (diff)
downloadffmpeg-9dd9090b89d57451740fe8d2d49082b1152d2928.tar.gz
avformat/nutdec: Return error on EOF from get_str()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6bbb2f8f4da67af374d62403742482cc5962aa21) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/nutdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index b1bbcb9ee5..52dbc99410 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -49,6 +49,8 @@ static int get_str(AVIOContext *bc, char *string, unsigned int maxlen)
if (maxlen)
string[FFMIN(len, maxlen - 1)] = 0;
+ if (bc->eof_reached)
+ return AVERROR_EOF;
if (maxlen == len)
return -1;
else