[vlc-commits] sgimb: use after free (fixes #8724)

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jun  4 23:44:13 2013 +0300| [51f7bb492c97e556ad2479863cba6cec9942bc87] | committer: Rémi Denis-Courmont

sgimb: use after free (fixes #8724)

(cherry picked from commit b701ae9ee5a78ca4d04d8c00c6c248d082dcc3f7)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=51f7bb492c97e556ad2479863cba6cec9942bc87
---

 modules/demux/playlist/sgimb.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/demux/playlist/sgimb.c b/modules/demux/playlist/sgimb.c
index a2bcb64..d98f4a8 100644
--- a/modules/demux/playlist/sgimb.c
+++ b/modules/demux/playlist/sgimb.c
@@ -367,13 +367,12 @@ static int Demux ( demux_t *p_demux )
             return -1;
         }
 
-        free( p_sys->psz_uri );
-        if( asprintf( &p_sys->psz_uri, "%s%%3FMeDiAbAsEshowingId=%d%%26MeDiAbAsEconcert%%3FMeDiAbAsE",
-                p_sys->psz_uri, p_sys->i_sid ) == -1 )
-        {
-            p_sys->psz_uri = NULL;
+        char *uri;
+        if( asprintf( &uri, "%s%%3FMeDiAbAsEshowingId=%d%%26MeDiAbAsEconcert"
+                      "%%3FMeDiAbAsE", p_sys->psz_uri, p_sys->i_sid ) == -1 )
             return -1;
-        }
+        free( p_sys->psz_uri );
+        p_sys->psz_uri = uri;
     }
 
     p_child = input_item_NewWithType( p_sys->psz_uri,