diff options
author | Nils Wallménius <nils@rockbox.org> | 2010-12-07 16:08:26 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2010-12-07 16:08:26 +0000 |
commit | d44fb16feb02e911e60ab48e3dc52454a03f3736 (patch) | |
tree | e53756caf2add21b2b3dfb8cfcb0a43f48bb43de /apps | |
parent | 13601883d51501880f7fcab2b5494d312d31dc3a (diff) | |
download | rockbox-d44fb16feb02e911e60ab48e3dc52454a03f3736.tar.gz rockbox-d44fb16feb02e911e60ab48e3dc52454a03f3736.zip |
libtremor: merge upstream revision 17519 'Correct an accidental dereference-before-check in error cleanup in comments.'
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28758 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs/libtremor/info.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/codecs/libtremor/info.c b/apps/codecs/libtremor/info.c index 62a31d510e..7c9af7ccdb 100644 --- a/apps/codecs/libtremor/info.c +++ b/apps/codecs/libtremor/info.c | |||
@@ -44,10 +44,12 @@ void vorbis_comment_init(vorbis_comment *vc){ | |||
44 | void vorbis_comment_clear(vorbis_comment *vc){ | 44 | void vorbis_comment_clear(vorbis_comment *vc){ |
45 | if(vc){ | 45 | if(vc){ |
46 | long i; | 46 | long i; |
47 | for(i=0;i<vc->comments;i++) | 47 | if(vc->user_comments){ |
48 | if(vc->user_comments[i])_ogg_free(vc->user_comments[i]); | 48 | for(i=0;i<vc->comments;i++) |
49 | if(vc->user_comments)_ogg_free(vc->user_comments); | 49 | if(vc->user_comments[i])_ogg_free(vc->user_comments[i]); |
50 | if(vc->comment_lengths)_ogg_free(vc->comment_lengths); | 50 | _ogg_free(vc->user_comments); |
51 | } | ||
52 | if(vc->comment_lengths)_ogg_free(vc->comment_lengths); | ||
51 | if(vc->vendor)_ogg_free(vc->vendor); | 53 | if(vc->vendor)_ogg_free(vc->vendor); |
52 | memset(vc,0,sizeof(*vc)); | 54 | memset(vc,0,sizeof(*vc)); |
53 | } | 55 | } |