summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Torri <storri@users.sourceforge.net>2004-01-04 00:00:58 +0000
committerStephen Torri <storri@users.sourceforge.net>2004-01-04 00:00:58 +0000
commit1fe26bd7061190f19b3afb55bade89d4bb52d424 (patch)
tree95b40101f6577c58488870a7718020f04346b901
parent30e9c39c8f141bd8f1d73ed0771503f2e3ecd5e8 (diff)
downloadxine-lib-1fe26bd7061190f19b3afb55bade89d4bb52d424.tar.gz
xine-lib-1fe26bd7061190f19b3afb55bade89d4bb52d424.tar.bz2
James Courtier-Dutton - Fix segfault when mrl is NULL
CVS patchset: 5986 CVS date: 2004/01/04 00:00:58
-rw-r--r--src/xine-engine/xine.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 68869b89a..fcc04cebd 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine.c,v 1.278 2003/12/28 15:01:39 siggi Exp $
+ * $Id: xine.c,v 1.279 2004/01/04 00:00:58 storri Exp $
*/
/*
@@ -512,6 +512,13 @@ static int __open_internal (xine_stream_t *stream, const char *mrl) {
const char *stream_setup;
+ if (!mrl) {
+ xprintf (stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+ stream->status = XINE_STATUS_STOP;
+ return 0;
+ }
+
lprintf ("opening MRL '%s'...\n", mrl);
/*