summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Farnsworth <simon.farnsworth@onelan.co.uk>2008-07-02 12:21:43 +0100
committerSimon Farnsworth <simon.farnsworth@onelan.co.uk>2008-07-02 12:21:43 +0100
commit4bec128b08b0b1fb42d482ac6fb802ab98aa556d (patch)
treeee8715d59d9094d07ec736c3dbc4836b956039a7
parent205eafe1f8ac38e8dfee646a19b86032e1b112f6 (diff)
downloadxine-lib-4bec128b08b0b1fb42d482ac6fb802ab98aa556d.tar.gz
xine-lib-4bec128b08b0b1fb42d482ac6fb802ab98aa556d.tar.bz2
Don't segfault when the user requests an input the card doesn't posess.
-rw-r--r--ChangeLog1
-rw-r--r--src/input/input_v4l.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 189d9a589..3edadc2a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
xine-lib (1.1.15) 2008-??-??
+ * V4L: Don't segfault if asked for an input that doesn't exist
xine-lib (1.1.14) 2008-06-29
* DVB changes:
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 29ed9899b..00c579c44 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1608,7 +1608,8 @@ static void v4l_plugin_dispose (input_plugin_t *this_gen) {
data. */
free(this->audio_content_base);
free(this->video_content_base);
- free(this->frames_base->extra_info);
+ if (this->frames_base)
+ free(this->frames_base->extra_info);
free(this->frames_base);
#ifdef LOG