diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index 7012c4ef12..2f9559fe8e 100644
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -276,7 +276,8 @@ static int decode_frame(AVCodecContext *avctx,
         }
     }
 
-    av_fast_malloc(&s->bitstream_buf, &s->bitstream_buf_size, (buf_end-buf) + FF_INPUT_BUFFER_PADDING_SIZE);
+    av_fast_padded_malloc(&s->bitstream_buf, &s->bitstream_buf_size,
+                          buf_end - buf);
     if (!s->bitstream_buf)
         return AVERROR(ENOMEM);
     s->dsp.bswap16_buf(s->bitstream_buf, (const uint16_t*)buf, (buf_end-buf)/2);
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 1945d88a23..9cd872b6c6 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -78,7 +78,7 @@ ffmpeg(){
     dec_opts="-threads $threads -thread_type $thread_type"
     ffmpeg_args="-nostats -cpuflags $cpuflags"
     for arg in $@; do
-        [ ${arg} = -i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}"
+        [ x${arg} = x-i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}"
         ffmpeg_args="${ffmpeg_args} ${arg}"
     done
     run ffmpeg ${ffmpeg_args}