[xine-devel] [PATCH] Don't segfault when the user requests an input the card doesn't posess

[Simon F. <sim...@on...>]

# HG changeset patch
# User Simon Farnsworth <sim...@on...>
# Date 1214997703 -3600
# Node ID 5d62e94d5a69b593f740ac740d5bf1e776750b31
# Parent  b7bf96df03d8bb105fc5f9e2c2ab92bb2282e309
Don't segfault when the user requests an input the card doesn't posess.

diff -r b7bf96df03d8 -r 5d62e94d5a69 ChangeLog
--- a/ChangeLog	Sun Jun 29 18:50:36 2008 +0100
+++ b/ChangeLog	Wed Jul 02 12:21:43 2008 +0100
@@ -22,6 +22,7 @@ xine-lib (1.1.14) 2008-06-29
     (Backported from the 1.2 branch.)
   * Fix MPEG TS audio stream problems introduced in 1.1.13.
   * Add basic aspect ratio detection for Windows Media Video streams.
+  * V4L: Don't segfault if asked for an input that doesn't exist
 
 xine-lib (1.1.13) 2008-06-15
   * Security fixes:
diff -r b7bf96df03d8 -r 5d62e94d5a69 src/input/input_v4l.c
--- a/src/input/input_v4l.c	Sun Jun 29 18:50:36 2008 +0100
+++ b/src/input/input_v4l.c	Wed Jul 02 12:21:43 2008 +0100
@@ -1608,7 +1608,8 @@ static void v4l_plugin_dispose (input_pl
      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