From 055a48d42a5779c15345713c09d3631d39698515 Mon Sep 17 00:00:00 2001 From: Tim Terriberry Date: Wed, 13 Oct 2010 23:17:20 +0000 Subject: Back out r17515. This accidentally contained far more than I meant to commit. git-svn-id: https://svn.xiph.org/trunk/Tremor@17516 0101bb08-14d6-0310-b084-bc0e0c8e3800 --- info.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'info.c') diff --git a/info.c b/info.c index 75e7205..f351a48 100644 --- a/info.c +++ b/info.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include "ivorbiscodec.h" #include "codec_internal.h" @@ -195,9 +194,9 @@ static int _vorbis_unpack_comment(vorbis_comment *vc,oggpack_buffer *opb){ if(vc->vendor==NULL)goto err_out; _v_readstring(opb,vc->vendor,vendorlen); i=oggpack_read(opb,32); - if(i<0||i>=INT_MAX||i>(opb->storage-oggpack_bytes(opb))>>2)goto err_out; - vc->user_comments=(char **)_ogg_calloc(i+1,sizeof(*vc->user_comments)); - vc->comment_lengths=(int *)_ogg_calloc(i+1, sizeof(*vc->comment_lengths)); + if(i<0||i>(opb->storage-oggpack_bytes(opb))>>2)goto err_out; + vc->user_comments=(char **)_ogg_calloc(vc->comments+1,sizeof(*vc->user_comments)); + vc->comment_lengths=(int *)_ogg_calloc(vc->comments+1, sizeof(*vc->comment_lengths)); if(vc->user_comments==NULL||vc->comment_lengths==NULL)goto err_out; vc->comments=i; -- cgit v1.2.1