[PATCH 2/4] libdvbv5: fix double free in dvb_fe_open_fname

[André Roth]

Since parms and fname is allocated outside of the function, do not free it.
Use dvb_v5_free for freeing parms, it will free fname if required.

Signed-off-by: André Roth <neol...@gmail.com>
---
 lib/libdvbv5/dvb-fe.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/libdvbv5/dvb-fe.c b/lib/libdvbv5/dvb-fe.c
index 7dcfa53e..5dcf492e 100644
--- a/lib/libdvbv5/dvb-fe.c
+++ b/lib/libdvbv5/dvb-fe.c
@@ -185,7 +185,7 @@ struct dvb_v5_fe_parms *dvb_fe_open_flags(int adapter, int 
frontend,
 
        ret = dvb_fe_open_fname(parms, fname, flags);
        if (ret < 0) {
-               free(parms);
+               dvb_v5_free(parms);
                return NULL;
        }
 
@@ -209,9 +209,7 @@ int dvb_fe_open_fname(struct dvb_v5_fe_parms_priv *parms, 
char *fname,
 
        if (xioctl(fd, FE_GET_INFO, &parms->p.info) == -1) {
                dvb_perror("FE_GET_INFO");
-               dvb_v5_free(parms);
                close(fd);
-               free(fname);
                return -errno;
        }
 
@@ -293,7 +291,6 @@ int dvb_fe_open_fname(struct dvb_v5_fe_parms_priv *parms, 
char *fname,
                }
                if (!parms->p.num_systems) {
                        dvb_logerr(_("delivery system not detected"));
-                       dvb_v5_free(parms);
                        close(fd);
                        return -EINVAL;
                }
@@ -304,7 +301,6 @@ int dvb_fe_open_fname(struct dvb_v5_fe_parms_priv *parms, 
char *fname,
                dtv_prop.props = parms->dvb_prop;
                if (xioctl(fd, FE_GET_PROPERTY, &dtv_prop) == -1) {
                        dvb_perror("FE_GET_PROPERTY");
-                       dvb_v5_free(parms);
                        close(fd);
                        return -errno;
                }
@@ -314,7 +310,6 @@ int dvb_fe_open_fname(struct dvb_v5_fe_parms_priv *parms, 
char *fname,
 
                if (parms->p.num_systems == 0) {
                        dvb_logerr(_("driver returned 0 supported delivery 
systems!"));
-                       dvb_v5_free(parms);
                        close(fd);
                        return -EINVAL;
                }
-- 
2.14.1