[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] CVS: xine-lib/src/input input_dvd.c,1.188,1.189
From:       James Courtier-Dutton <jcdutton () users ! sourceforge ! net>
Date:       2004-08-28 22:51:53
Message-ID: E1C1C37-0007UE-UG () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/xine/xine-lib/src/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28652/xine-lib/src/input

Modified Files:
	input_dvd.c 
Log Message:
Fix a crash when dispose it called before the DVD starts playing.
This needs to be fixed in libdvdnav as well.



Index: input_dvd.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_dvd.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- input_dvd.c	28 Aug 2004 15:06:26 -0000	1.188
+++ input_dvd.c	28 Aug 2004 22:51:50 -0000	1.189
@@ -409,7 +409,8 @@
     xine_event_dispose_queue (this->event_queue);
    
   ((dvd_input_class_t *)this_gen->input_class)->ip = NULL;
-  dvdnav_close(this->dvdnav);
+  if (this->dvdnav)
+    dvdnav_close(this->dvdnav);
   
   pthread_mutex_lock(&this->buf_mutex);
   if (this->mem_stack) {
@@ -420,7 +421,8 @@
   } else {
     pthread_mutex_unlock(&this->buf_mutex);
     pthread_mutex_destroy(&this->buf_mutex);
-    free(this->mem);
+    if (this->mem)
+      free(this->mem);
     free(this);
   }
 }



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
[prev in list] [next in list] [prev in thread] [next in thread]