Browse Source

FFplay : Avoid manipulating NULL data pointers so that future checks

remain valid. This fixes segfaults for those cases where data copy to
this invalid pointer is attempted.

Originally committed as revision 23264 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/n0.8
Jai Menon 15 years ago
parent
commit
3635c07bd1
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      ffplay.c

+ 2
- 0
ffplay.c View File

@@ -1591,7 +1591,9 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
unsigned hshift = i == 0 ? 0 : av_pix_fmt_descriptors[ref->pic->format].log2_chroma_w;
unsigned vshift = i == 0 ? 0 : av_pix_fmt_descriptors[ref->pic->format].log2_chroma_h;

if (ref->data[i]) {
ref->data[i] += (edge >> hshift) + ((edge * ref->linesize[i]) >> vshift);
}
pic->data[i] = ref->data[i];
pic->linesize[i] = ref->linesize[i];
}


Loading…
Cancel
Save