[vlc-devel] commit: Fix [343c86e8d2522b5c3b482fee76ea16be7c34b3ed]. (Alexis Ballier )

[git version control]

vlc | branch: 0.9-bugfix | Alexis Ballier <aballier at gentoo.org> | Wed Mar 11 13:51:19 2009 +0100| [8f8d7e702248b55856e7b3e2747e56353810be15] | committer: Ilkka Ollakka 

Fix [343c86e8d2522b5c3b482fee76ea16be7c34b3ed].

This acutally causes a segfault with the sample xspf files given in #2353 because psz_uri is always NULL when given to input_item_SetURI.
Reported by Aniruddha Shankar <k at 191a.net> on https://bugs.gentoo.org/show_bug.cgi?id=261948

Signed-off-by: Ilkka Ollakka <ileoo at videolan.org>

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

 modules/demux/playlist/xspf.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index 3516295..f724a56 100644
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -569,8 +569,7 @@ static bool parse_track_node COMPLEX_INTERFACE
                            free( psz_uri );
                            psz_uri = psz_tmp;
                         }
-                        p_new_input = input_item_NewExt( p_demux, psz_uri,
-                                                        NULL, 0, NULL, -1 );
+                        input_item_SetURI( p_new_input, psz_uri );
                         free( psz_uri );
                         input_item_CopyOptions( p_input_item, p_new_input );
                         psz_uri = NULL;
@@ -582,12 +581,6 @@ static bool parse_track_node COMPLEX_INTERFACE
                         FREE_ATT();
                         return false;
                     }
-                    input_item_SetURI( p_new_input, psz_uri );
-                    free( psz_uri );
-                    input_item_CopyOptions( p_input_item, p_new_input );
-                    psz_uri = NULL;
-                    FREE_ATT();
-                    p_handler = NULL;
                 }
                 else
                 {