@@ -789,6 +789,16 @@ rm_ac3_swap_bytes (AVStream *st, AVPacket *pkt)

     }

 }

+static int readfull(AVFormatContext *s, AVIOContext *pb, uint8_t *dst, int n) {

+    int ret = avio_read(pb, dst, n);

+    if (ret != n) {

+        if (ret >= 0) memset(dst + ret, 0, n - ret);

+        else          memset(dst      , 0, n);

+        av_log(s, AV_LOG_ERROR, "Failed to fully read block\n");

+    }

+    return ret;

+}

+

 int

 ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,

                     AVStream *st, RMStream *ast, int len, AVPacket *pkt,

@@ -821,14 +831,14 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,

             switch (ast->deint_id) {

                 case DEINT_ID_INT4:

                     for (x = 0; x < h/2; x++)

-                        avio_read(pb, ast->pkt.data+x*2*w+y*cfs, cfs);

+                        readfull(s, pb, ast->pkt.data+x*2*w+y*cfs, cfs);

                     break;

                 case DEINT_ID_GENR:

                     for (x = 0; x < w/sps; x++)

-                        avio_read(pb, ast->pkt.data+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps);

+                        readfull(s, pb, ast->pkt.data+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps);

                     break;

                 case DEINT_ID_SIPR:

-                    avio_read(pb, ast->pkt.data + y * w, w);

+                    readfull(s, pb, ast->pkt.data + y * w, w);

                     break;

             }

@@ -31,8 +31,9 @@ fate-sipr-8k5: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_8k5.rm

 fate-sipr-8k5: REF = $(SAMPLES)/sipr/sipr_8k5.pcm

 FATE_SIPR += fate-sipr-16k

-fate-sipr-16k: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_16k.rm

+fate-sipr-16k: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_16k.rm -aframes 3250

 fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm

+fate-sipr-16k: SIZE_TOLERANCE = 40000

 $(FATE_SIPR): CMP = oneoff