Enlightenment CVS committal
Author : tsauerbeck
Project : misc
Module : eplayer
Dir : misc/eplayer/src
Modified Files:
playlist.c track.c
Log Message:
fixed some segfaults
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/playlist.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- playlist.c 3 Feb 2004 22:01:57 -0000 1.24
+++ playlist.c 3 Feb 2004 22:11:47 -0000 1.25
@@ -1,5 +1,5 @@
/*
- * $Id: playlist.c,v 1.24 2004/02/03 22:01:57 tsauerbeck Exp $
+ * $Id: playlist.c,v 1.25 2004/02/03 22:11:47 tsauerbeck Exp $
*/
#include <config.h>
@@ -94,11 +94,17 @@
}
bool playlist_current_item_has_next(PlayList *pl) {
- return pl ? !!pl->cur_item->next : false;
+ if (!pl || !pl->cur_item)
+ return false;
+
+ return !!pl->cur_item->next;
}
bool playlist_current_item_has_prev(PlayList *pl) {
- return pl ? !!pl->cur_item->prev : false;
+ if (!pl || !pl->cur_item)
+ return false;
+
+ return !!pl->cur_item->prev;
}
/**
@@ -108,7 +114,7 @@
* @return true if the current item has been set to the beginning, else false
*/
bool playlist_current_item_next(PlayList *pl) {
- if (!pl)
+ if (!pl || !pl->cur_item)
return false;
if (pl->cur_item->next) {
@@ -121,7 +127,7 @@
}
bool playlist_current_item_prev(PlayList *pl) {
- if (!pl)
+ if (!pl || !pl->cur_item)
return false;
if (playlist_current_item_has_prev(pl)) {
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/track.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- track.c 3 Feb 2004 22:01:57 -0000 1.18
+++ track.c 3 Feb 2004 22:11:47 -0000 1.19
@@ -1,5 +1,5 @@
/*
- * $Id: track.c,v 1.18 2004/02/03 22:01:57 tsauerbeck Exp $
+ * $Id: track.c,v 1.19 2004/02/03 22:11:47 tsauerbeck Exp $
*/
#include <config.h>
@@ -75,9 +75,10 @@
* @param player
*/
void track_open(ePlayer *player) {
- PlayListItem *pli = playlist_current_item_get(player->playlist);
-
- assert(pli);
+ PlayListItem *pli;
+
+ if (!(pli = playlist_current_item_get(player->playlist)))
+ return;
pli->current_pos = 0;
pli->plugin->open(pli->file);
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
