summaryrefslogtreecommitdiff
path: root/source/l/v4l-utils
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/v4l-utils')
-rwxr-xr-xsource/l/v4l-utils/v4l-utils.SlackBuild5
-rw-r--r--source/l/v4l-utils/v4l-utils.c82608ca1595427c2bdbd4abb9aca9163e1df60a.patch96
2 files changed, 1 insertions, 100 deletions
diff --git a/source/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild
index ed61bf3e..17982dc1 100755
--- a/source/l/v4l-utils/v4l-utils.SlackBuild
+++ b/source/l/v4l-utils/v4l-utils.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=v4l-utils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -79,9 +79,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Revert patch that breaks DVB:
-zcat $CWD/v4l-utils.c82608ca1595427c2bdbd4abb9aca9163e1df60a.patch.gz | patch -p1 -R --verbose || exit 1
-
# qvidcap requires Qt5 - quit disabling it once we have that.
# qv4l2 requires Qt5 - quit disabling it once we have that.
diff --git a/source/l/v4l-utils/v4l-utils.c82608ca1595427c2bdbd4abb9aca9163e1df60a.patch b/source/l/v4l-utils/v4l-utils.c82608ca1595427c2bdbd4abb9aca9163e1df60a.patch
deleted file mode 100644
index 9aed81b4..00000000
--- a/source/l/v4l-utils/v4l-utils.c82608ca1595427c2bdbd4abb9aca9163e1df60a.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From c82608ca1595427c2bdbd4abb9aca9163e1df60a Mon Sep 17 00:00:00 2001
-From: Sean Young <sean@mess.org>
-Date: Sun, 17 Mar 2019 16:13:45 +0000
-Subject: libdvbv5: leaks and double free in dvb_fe_open_fname()
-
-dvb_fe_open_fname() takes ownership of fname if the function succeeds, but
-also in two of the error paths (e.g. if the ioctl FE_GET_PROPERTY fails).
-
-Adjust dvb_fe_open_fname() so it copies fname rather than taking ownership
-(and passing that to params). This makes the code cleaner.
-
-Signed-off-by: Sean Young <sean@mess.org>
-
-diff --git a/lib/libdvbv5/dvb-dev-local.c b/lib/libdvbv5/dvb-dev-local.c
-index e98b967..2de9a61 100644
---- a/lib/libdvbv5/dvb-dev-local.c
-+++ b/lib/libdvbv5/dvb-dev-local.c
-@@ -467,7 +467,7 @@ static struct dvb_open_descriptor
- flags &= ~O_NONBLOCK;
- }
-
-- ret = dvb_fe_open_fname(parms, strdup(dev->path), flags);
-+ ret = dvb_fe_open_fname(parms, dev->path, flags);
- if (ret) {
- free(open_dev);
- return NULL;
-diff --git a/lib/libdvbv5/dvb-fe.c b/lib/libdvbv5/dvb-fe.c
-index 7dcfa53..514a187 100644
---- a/lib/libdvbv5/dvb-fe.c
-+++ b/lib/libdvbv5/dvb-fe.c
-@@ -133,7 +133,6 @@ struct dvb_v5_fe_parms *dvb_fe_open_flags(int adapter, int frontend,
- int flags)
- {
- int ret;
-- char *fname;
- struct dvb_device *dvb;
- struct dvb_dev_list *dvb_dev;
- struct dvb_v5_fe_parms_priv *parms = NULL;
-@@ -153,7 +152,6 @@ struct dvb_v5_fe_parms *dvb_fe_open_flags(int adapter, int frontend,
- dvb_dev_free(dvb);
- return NULL;
- }
-- fname = strdup(dvb_dev->path);
-
- if (!strcmp(dvb_dev->bus_addr, "platform:dvbloopback")) {
- logfunc(LOG_WARNING, _("Detected dvbloopback"));
-@@ -161,14 +159,10 @@ struct dvb_v5_fe_parms *dvb_fe_open_flags(int adapter, int frontend,
- }
-
- dvb_dev_free(dvb);
-- if (!fname) {
-- logfunc(LOG_ERR, _("fname calloc: %s"), strerror(errno));
-- return NULL;
-- }
-+
- parms = calloc(sizeof(*parms), 1);
- if (!parms) {
- logfunc(LOG_ERR, _("parms calloc: %s"), strerror(errno));
-- free(fname);
- return NULL;
- }
- parms->p.verbose = verbose;
-@@ -183,7 +177,7 @@ struct dvb_v5_fe_parms *dvb_fe_open_flags(int adapter, int frontend,
- if (use_legacy_call)
- parms->p.legacy_fe = 1;
-
-- ret = dvb_fe_open_fname(parms, fname, flags);
-+ ret = dvb_fe_open_fname(parms, dvb_dev->path, flags);
- if (ret < 0) {
- free(parms);
- return NULL;
-@@ -203,7 +197,6 @@ int dvb_fe_open_fname(struct dvb_v5_fe_parms_priv *parms, char *fname,
- fd = open(fname, flags, 0);
- if (fd == -1) {
- dvb_logerr(_("%s while opening %s"), strerror(errno), fname);
-- free(fname);
- return -errno;
- }
-
-@@ -226,7 +219,12 @@ int dvb_fe_open_fname(struct dvb_v5_fe_parms_priv *parms, char *fname,
- }
- }
-
-- parms->fname = fname;
-+ parms->fname = strdup(fname);
-+ if (!parms->fname) {
-+ dvb_logerr(_("fname calloc: %s"), strerror(errno));
-+ return -errno;
-+ }
-+
- parms->fd = fd;
- parms->fe_flags = flags;
- parms->dvb_prop[0].cmd = DTV_API_VERSION;
---
-cgit v0.10.2
-