[vlc-commits] commit: Fixed a potential double free on error in qtl/shoutcast demuxers. ( Laurent Aimar )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Oct 31 12:31:32 2010 +0100| [bec259b4b7aacaf64a21b2f594db9c0eb7069bef] | committer: Rémi Duraffort 

Fixed a potential double free on error in qtl/shoutcast demuxers.
(cherry picked from commit d9f4825a3fa8b2193a14d41d6f01db1eaa6f3f7a)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=bec259b4b7aacaf64a21b2f594db9c0eb7069bef
---

 modules/demux/playlist/qtl.c       |    1 +
 modules/demux/playlist/shoutcast.c |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/demux/playlist/qtl.c b/modules/demux/playlist/qtl.c
index d10d4f5..226b287 100644
--- a/modules/demux/playlist/qtl.c
+++ b/modules/demux/playlist/qtl.c
@@ -148,6 +148,7 @@ static int Demux( demux_t *p_demux )
         msg_Err( p_demux, "invalid root node %i, %s",
                  xml_ReaderNodeType( p_xml_reader ), psz_eltname );
         free( psz_eltname );
+        psz_eltname = NULL;
 
         /* second line has <?quicktime tag ... so we try to skip it */
         msg_Dbg( p_demux, "trying to read one more node" );
diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
index 14891d1..aa0f9d0 100644
--- a/modules/demux/playlist/shoutcast.c
+++ b/modules/demux/playlist/shoutcast.c
@@ -188,7 +188,6 @@ static int DemuxGenre( demux_t *p_demux, xml_reader_t *p_xml_reader,
                         {
                             free( psz_attrname );
                             free( psz_attrvalue );
-                            free( psz_eltname );
                             break;
                         }