summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTim Champagne <tchamp@users.sourceforge.net>2003-06-09 00:37:27 +0000
committerTim Champagne <tchamp@users.sourceforge.net>2003-06-09 00:37:27 +0000
commit9b8180d8207072f9ebd8b91abbda01f2ead91760 (patch)
tree96c2fc48fa9b1e45d6d3008cb33f61f8fe25f160 /src
parent9e4df22041c29cc502dbe3e3e1df2432fc2037d7 (diff)
downloadxine-lib-9b8180d8207072f9ebd8b91abbda01f2ead91760.tar.gz
xine-lib-9b8180d8207072f9ebd8b91abbda01f2ead91760.tar.bz2
This should fix the SIGSEGV in the cdda input module but it will probably not fix the auto play feature.
CVS patchset: 5014 CVS date: 2003/06/09 00:37:27
Diffstat (limited to 'src')
-rw-r--r--src/input/input_cdda.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index c7a93a1bb..f29ed84a5 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
* Compact Disc Digital Audio (CDDA) Input Plugin
* by Mike Melanson (melanson@pcisys.net)
*
- * $Id: input_cdda.c,v 1.26 2003/05/20 20:40:29 tchamp Exp $
+ * $Id: input_cdda.c,v 1.27 2003/06/09 00:37:27 tchamp Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -2437,9 +2437,13 @@ static char ** cdda_class_get_autoplay_list (input_class_t *this_gen,
#endif
if (fd == -1) {
- if (cdda_open(ip, ip->cdda_device, &toc) == -1) {
- return NULL;
+ if (ip) {
+ if (cdda_open(ip, ip->cdda_device, &toc) == -1) {
+ return NULL;
+ }
}
+ else
+ return NULL;
}