summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-20 13:14:09 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-20 13:14:09 +0000
commit6d708c31b6f8f7884681c229d269b89f083a9af6 (patch)
tree138586901e1b86ec327aa387c48e4105e03dafdf /libmpdemux
parentb5d12d6e0fc3ec6d054c743b3743c0257fd39adf (diff)
downloadmpv-6d708c31b6f8f7884681c229d269b89f083a9af6.tar.bz2
mpv-6d708c31b6f8f7884681c229d269b89f083a9af6.tar.xz
vc1 probing code: if sh_video->bih can't be callocated exit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21970 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/video.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index ea770e26fb..6ff8210564 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -401,6 +401,10 @@ mpeg_header_parser:
if(mp_vc1_decode_sequence_header(&picture, &videobuffer[4], videobuf_len-4)) {
sh_video->bih = (BITMAPINFOHEADER *) calloc(1, sizeof(BITMAPINFOHEADER) + videobuf_len);
+ if(sh_video->bih == NULL) {
+ mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Couldn't alloc %d bytes for VC-1 extradata!\n", sizeof(BITMAPINFOHEADER) + videobuf_len);
+ return 0;
+ }
sh_video->bih->biSize= sizeof(BITMAPINFOHEADER) + videobuf_len;
memcpy(sh_video->bih + 1, videobuffer, videobuf_len);
sh_video->bih->biCompression = sh_video->format;