Fix segfault when oppening a radio device.

Original commit message from CVS:
Fix segfault when oppening a radio device.

diff --git a/ChangeLog b/ChangeLog
index 4df99caa51ff5629e2d53500e64312daf27d79db..75620919cf286d01dd491a7bf9c7a3a093689c16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-22  Edgard Lima <edgard.lima@indt.org.br>
+
+       * sys/v4l2/gstv4l2object.c:
+       * sys/v4l2/gstv4l2tuner.c:
+       * sys/v4l2/v4l2_calls.c:
+       Fix segfault when oppening a radio device.
+       
 2007-02-22  Stefan Kost  <ensonic@users.sf.net>
 
        * gst/level/gstlevel.c: (gst_level_set_caps),

diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 7f8df175c1217770ca552d481a1e943531db671c..48497fc7430475f8b55bc249172ea0191f1a5486 100644 (file)
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -431,12 +431,15 @@ gst_v4l2_set_defaults (GstV4l2Object * v4l2object)
     channel =
         GST_TUNER_CHANNEL (gst_tuner_get_channel (GST_TUNER (v4l2object->
                 element)));
-    g_free (v4l2object->channel);
-    v4l2object->channel = g_strdup (channel->label);
-    gst_tuner_channel_changed (tuner, channel);
+    if (channel) {
+      g_free (v4l2object->channel);
+      v4l2object->channel = g_strdup (channel->label);
+      gst_tuner_channel_changed (tuner, channel);
+    }
   }
 
-  if (GST_TUNER_CHANNEL_HAS_FLAG (channel, GST_TUNER_CHANNEL_FREQUENCY)) {
+  if (channel
+      && GST_TUNER_CHANNEL_HAS_FLAG (channel, GST_TUNER_CHANNEL_FREQUENCY)) {
     if (v4l2object->frequency != 0) {
       gst_tuner_set_frequency (tuner, channel, v4l2object->frequency);
     } else {

diff --git a/sys/v4l2/gstv4l2tuner.c b/sys/v4l2/gstv4l2tuner.c
index 699540c99d79fa1a0e28ecb298d4f611fb0b0796..da31e1569a4884c8a3114e5b8ecd0ae65eac3e8d 100644 (file)
--- a/sys/v4l2/gstv4l2tuner.c
+++ b/sys/v4l2/gstv4l2tuner.c
@@ -171,11 +171,13 @@ gst_v4l2_tuner_get_channel (GstV4l2Object * v4l2object)
   /* assert that we're opened and that we're using a known item */
   g_return_val_if_fail (GST_V4L2_IS_OPEN (v4l2object), NULL);
 
-  v4l2object->get_in_out_func (v4l2object, &channel);
+  if (v4l2object->get_in_out_func (v4l2object, &channel)) {
+
+    for (item = v4l2object->channels; item != NULL; item = item->next) {
+      if (channel == GST_V4L2_TUNER_CHANNEL (item->data)->index)
+        return (GstTunerChannel *) item->data;
+    }
 
-  for (item = v4l2object->channels; item != NULL; item = item->next) {
-    if (channel == GST_V4L2_TUNER_CHANNEL (item->data)->index)
-      return (GstTunerChannel *) item->data;
   }
 
   return NULL;
@@ -271,15 +273,17 @@ gst_v4l2_tuner_set_frequency (GstV4l2Object * v4l2object,
   g_return_val_if_fail (gst_v4l2_tuner_contains_channel (v4l2object,
           v4l2channel), FALSE);
 
-  v4l2object->get_in_out_func (v4l2object, &chan);
-  if (chan == GST_V4L2_TUNER_CHANNEL (channel)->index &&
-      GST_TUNER_CHANNEL_HAS_FLAG (channel, GST_TUNER_CHANNEL_FREQUENCY)) {
-    if (gst_v4l2_set_frequency (v4l2object, v4l2channel->tuner, frequency)) {
-      gst_tuner_frequency_changed (GST_TUNER (v4l2object->element), channel,
-          frequency);
-      return TRUE;
+  if (v4l2object->get_in_out_func (v4l2object, &chan)) {
+    if (chan == GST_V4L2_TUNER_CHANNEL (channel)->index &&
+        GST_TUNER_CHANNEL_HAS_FLAG (channel, GST_TUNER_CHANNEL_FREQUENCY)) {
+      if (gst_v4l2_set_frequency (v4l2object, v4l2channel->tuner, frequency)) {
+        gst_tuner_frequency_changed (GST_TUNER (v4l2object->element), channel,
+            frequency);
+        return TRUE;
+      }
     }
   }
+
   return FALSE;
 }
 
@@ -298,10 +302,11 @@ gst_v4l2_tuner_get_frequency (GstV4l2Object * v4l2object,
   g_return_val_if_fail (gst_v4l2_tuner_contains_channel (v4l2object,
           v4l2channel), 0);
 
-  v4l2object->get_in_out_func (v4l2object, &chan);
-  if (chan == GST_V4L2_TUNER_CHANNEL (channel)->index &&
-      GST_TUNER_CHANNEL_HAS_FLAG (channel, GST_TUNER_CHANNEL_FREQUENCY)) {
-    gst_v4l2_get_frequency (v4l2object, v4l2channel->tuner, &frequency);
+  if (v4l2object->get_in_out_func (v4l2object, &chan)) {
+    if (chan == GST_V4L2_TUNER_CHANNEL (channel)->index &&
+        GST_TUNER_CHANNEL_HAS_FLAG (channel, GST_TUNER_CHANNEL_FREQUENCY)) {
+      gst_v4l2_get_frequency (v4l2object, v4l2channel->tuner, &frequency);
+    }
   }
 
   return frequency;
@@ -322,10 +327,11 @@ gst_v4l2_tuner_signal_strength (GstV4l2Object * v4l2object,
   g_return_val_if_fail (gst_v4l2_tuner_contains_channel (v4l2object,
           v4l2channel), 0);
 
-  v4l2object->get_in_out_func (v4l2object, &chan);
-  if (chan == GST_V4L2_TUNER_CHANNEL (channel)->index &&
-      GST_TUNER_CHANNEL_HAS_FLAG (channel, GST_TUNER_CHANNEL_FREQUENCY)) {
-    gst_v4l2_signal_strength (v4l2object, v4l2channel->tuner, &signal);
+  if (v4l2object->get_in_out_func (v4l2object, &chan)) {
+    if (chan == GST_V4L2_TUNER_CHANNEL (channel)->index &&
+        GST_TUNER_CHANNEL_HAS_FLAG (channel, GST_TUNER_CHANNEL_FREQUENCY)) {
+      gst_v4l2_signal_strength (v4l2object, v4l2channel->tuner, &signal);
+    }
   }
 
   return signal;

diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
index 3b89fabf0834813235fbfcb2d012a28b87477426..bd791b9017660bb97ca4b8df7e5e6acda8a8ed96 100644 (file)
--- a/sys/v4l2/v4l2_calls.c
+++ b/sys/v4l2/v4l2_calls.c
@@ -726,8 +726,7 @@ gst_v4l2_get_input (GstV4l2Object * v4l2object, gint * input)
 input_failed:
   {
     GST_ELEMENT_WARNING (v4l2object->element, RESOURCE, SETTINGS,
-        (_("Failed to get current input on device '%s'."),
-            v4l2object->videodev), GST_ERROR_SYSTEM);
+        (_("Failed to get current input on device '%s'. May be it is a radio device"), v4l2object->videodev), GST_ERROR_SYSTEM);
     return FALSE;
   }
 }