From e8472967173aa6095850a677cbd328f8f7e0523c Mon Sep 17 00:00:00 2001 From: Tim Terriberry Date: Wed, 13 Oct 2010 23:37:40 +0000 Subject: Port r14984 from libvorbis. Correct an accidental dereference-before-check in error cleanup in comments. git-svn-id: https://svn.xiph.org/trunk/Tremor@17519 0101bb08-14d6-0310-b084-bc0e0c8e3800 --- info.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/info.c b/info.c index 75e7205..bc7ee8a 100644 --- a/info.c +++ b/info.c @@ -92,10 +92,12 @@ int vorbis_comment_query_count(vorbis_comment *vc, char *tag){ void vorbis_comment_clear(vorbis_comment *vc){ if(vc){ long i; - for(i=0;icomments;i++) - if(vc->user_comments[i])_ogg_free(vc->user_comments[i]); - if(vc->user_comments)_ogg_free(vc->user_comments); - if(vc->comment_lengths)_ogg_free(vc->comment_lengths); + if(vc->user_comments){ + for(i=0;icomments;i++) + if(vc->user_comments[i])_ogg_free(vc->user_comments[i]); + _ogg_free(vc->user_comments); + } + if(vc->comment_lengths)_ogg_free(vc->comment_lengths); if(vc->vendor)_ogg_free(vc->vendor); memset(vc,0,sizeof(*vc)); } -- cgit v1.2.1