From d5dbe58af2714c775f2be9fb69734193f1f8e871 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Wed, 7 Mar 2007 19:48:03 +0000 Subject: ext/raw1394/gstdv1394src.c: Free handles that we allocated when exiting via the error paths. Original commit message from CVS: * ext/raw1394/gstdv1394src.c: (gst_dv1394src_start): Free handles that we allocated when exiting via the error paths. --- ChangeLog | 5 +++++ common | 2 +- ext/raw1394/gstdv1394src.c | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bcd31004..aa4e94ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-03-07 Jan Schmidt + + * ext/raw1394/gstdv1394src.c: (gst_dv1394src_start): + Free handles that we allocated when exiting via the error paths. + 2007-03-07 Stefan Kost * gst/level/gstlevel.c: (gst_level_class_init), diff --git a/common b/common index c4f56a65..7c5a0ab6 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit c4f56a657d79aee0e3fc25ef2bcf876f9f3c1593 +Subproject commit 7c5a0ab68de1fed4e5a1fd473160debc2c4c7b89 diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c index 5b0d9099..d10c389c 100644 --- a/ext/raw1394/gstdv1394src.c +++ b/ext/raw1394/gstdv1394src.c @@ -842,6 +842,8 @@ no_handle: } no_ports: { + raw1394_destroy_handle (src->handle); + src->handle = NULL; GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, (NULL), ("no ports available for raw1394")); return FALSE; @@ -854,6 +856,12 @@ cannot_set_port: } cannot_start: { + raw1394_destroy_handle (src->handle); + src->handle = NULL; +#ifdef HAVE_LIBIEC61883 + iec61883_dv_fb_close (src->iec61883dv); + src->iec61883dv = NULL; +#endif GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), ("can't start 1394 iso receive")); return FALSE; @@ -861,6 +869,8 @@ cannot_start: #ifdef HAVE_LIBIEC61883 cannot_initialise_dv: { + raw1394_destroy_handle (src->handle); + src->handle = NULL; GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), ("can't initialise iec61883 dv")); return FALSE; -- cgit