[FFmpeg-devel] [PATCH] flvdec: Check the avio_seek return value after reading a metadata packet

[Armstrong Huang]

In most cases, flv_read_metabody reads pass the beginning of the meta_pos.
If the beginning of the meta_pos had been flushed from the IO buffer,
we would not be able to seek to the right position (for a nonseekable stream).

Is better to check the seek result and skip the current flv body if necessary,
than to silently try to read from a
desynchronized stream that will only be interpreted as garbage.

Signed-off-by: Armstrong Huang <armstrong at sweelia.com>
---
 libavformat/flvdec.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index d83edff727..21ff73a1aa 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -1096,7 +1096,18 @@ retry:
             } else if (type == TYPE_UNKNOWN) {
                 stream_type = FLV_STREAM_TYPE_DATA;
             }
-            avio_seek(s->pb, meta_pos, SEEK_SET);
+            if (avio_seek(s->pb, meta_pos, SEEK_SET) != meta_pos) {
+                /**
+                 * This can happen after flv_read_metabody
+                 * above, on a non-seekable input, and the
+                 * preceding data has been flushed out from
+                 * the IO buffer.
+                 */
+                av_log(s, AV_LOG_ERROR,
+                       "Unable to seek back to the meta_pos: %ld\n",
+                       meta_pos);
+                goto skip;
+            }
         }
     } else {
         av_log(s, AV_LOG_DEBUG,
-- 
2.20.1