Fix dvd://.../title[.chapter] handling (broken in cset 2e301bc2cce8).

2 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f82f610c..1267ffdbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 xine-lib (1.1.9) (unreleased)
+  * Fix dvd://.../title[.chapter] handling (somewhat broken in 1.1.8).
 
 xine-lib (1.1.8)
   * Send a channel-changed event to the frontend when receiving the SYNC
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 34729e8c2..0cc4deda9 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1505,8 +1505,6 @@ static int dvd_plugin_open (input_plugin_t *this_gen) {
     return 0;
   }
 
-  free (locator_orig);
-  
   dvdnav_get_title_string(this->dvdnav, &this->dvd_name);
   if(this->dvd_name)
     _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, this->dvd_name);
@@ -1554,6 +1552,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen) {
 	      "input_dvd: Title %i is out of range (1 to %i).\n", tt, titles);
       dvdnav_close(this->dvdnav);
       this->dvdnav = NULL;
+      free (locator_orig);
       return 0;
     }
 
@@ -1567,6 +1566,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen) {
 		"input_dvd: Part %i is out of range (1 to %i).\n", pr, parts);
 	dvdnav_close(this->dvdnav);
 	this->dvdnav = NULL;
+	free (locator_orig);
 	return 0;
       }
     }
@@ -1598,7 +1598,8 @@ static int dvd_plugin_open (input_plugin_t *this_gen) {
   xine_event_send(this->stream, &event);
 
   update_title_display(this);
-  
+
+  free (locator_orig);
   return 1;
 }