From ec4ff661c1ba939b2e2f8165f6d4e58396ad1747 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Fri, 23 Mar 2018 05:34:33 +0100 Subject: [PATCH] Contribs: update libdvdcss to 1.4.2 --- contrib/src/dvdcss/SHA512SUMS | 2 +- contrib/src/dvdcss/fix-buffer-overflow.patch | 34 ---------------------------- contrib/src/dvdcss/fix-uninit-ptr-free.patch | 25 -------------------- contrib/src/dvdcss/rules.mak | 4 +--- 4 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 contrib/src/dvdcss/fix-buffer-overflow.patch delete mode 100644 contrib/src/dvdcss/fix-uninit-ptr-free.patch diff --git a/contrib/src/dvdcss/SHA512SUMS b/contrib/src/dvdcss/SHA512SUMS index 1ec57cb475..6ae6e45597 100644 --- a/contrib/src/dvdcss/SHA512SUMS +++ b/contrib/src/dvdcss/SHA512SUMS @@ -1 +1 @@ -4456ebcf8b53a8aaee97643261a14a05c929e9e9120cbe5fc6839ddf62be3dcfe7313fca3ee57c00bea43ddf623dc3d61fff7c2f6316338495df95c9c422f39e libdvdcss-1.4.1.tar.bz2 +e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c libdvdcss-1.4.2.tar.bz2 diff --git a/contrib/src/dvdcss/fix-buffer-overflow.patch b/contrib/src/dvdcss/fix-buffer-overflow.patch deleted file mode 100644 index 551e28ccb7..0000000000 --- a/contrib/src/dvdcss/fix-buffer-overflow.patch +++ /dev/null @@ -1,34 +0,0 @@ -From eab9626405faad756ef83f150505467f20bc931f Mon Sep 17 00:00:00 2001 -From: Pierre Lamot -Date: Thu, 1 Mar 2018 10:41:45 +0100 -Subject: [PATCH 1/2] Fix buffer overflow when region mask is 0x0 - -Signed-off-by: Jean-Baptiste Kempf ---- - src/css.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/css.c b/src/css.c -index f7e5a88..55cb8df 100644 ---- a/src/css.c -+++ b/src/css.c -@@ -101,7 +101,7 @@ static int dvdcss_titlekey ( dvdcss_t, int, dvd_key ); - int dvdcss_test( dvdcss_t dvdcss ) - { - const char *psz_type, *psz_rpc; -- char psz_region[16]; -+ char psz_region[17]; - char *p_region = psz_region; - int i_ret, i_copyright, i_type, i_mask, i_rpc, i_region; - -@@ -160,6 +160,7 @@ int dvdcss_test( dvdcss_t dvdcss ) - default: psz_type = "unknown status"; break; - } - -+ *p_region = '\0'; - for( i_region = 0; i_region < 8; i_region++ ) - { - if( !( i_mask & ( 1 << i_region ) ) ) --- -2.11.0 - diff --git a/contrib/src/dvdcss/fix-uninit-ptr-free.patch b/contrib/src/dvdcss/fix-uninit-ptr-free.patch deleted file mode 100644 index 47041dfaf1..0000000000 --- a/contrib/src/dvdcss/fix-uninit-ptr-free.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f88ec35dfd616ca94217658523ca5b8de0a2cb73 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= -Date: Thu, 1 Mar 2018 11:12:10 +0100 -Subject: [PATCH 2/2] Fix potential free of uninitialized pointer - -Signed-off-by: Jean-Baptiste Kempf ---- - src/libdvdcss.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libdvdcss.c b/src/libdvdcss.c -index a659bf3..8f4c421 100644 ---- a/src/libdvdcss.c -+++ b/src/libdvdcss.c -@@ -522,6 +522,7 @@ static dvdcss_t dvdcss_open_common ( const char *psz_target, void *p_stream, - if( psz_target == NULL && - ( p_stream == NULL || p_stream_cb == NULL ) ) - { -+ dvdcss->psz_device = NULL; - goto error; - } - --- -2.11.0 - diff --git a/contrib/src/dvdcss/rules.mak b/contrib/src/dvdcss/rules.mak index c462b55764..26bdae3f62 100644 --- a/contrib/src/dvdcss/rules.mak +++ b/contrib/src/dvdcss/rules.mak @@ -1,5 +1,5 @@ # DVDCSS -DVDCSS_VERSION := 1.4.1 +DVDCSS_VERSION := 1.4.2 DVDCSS_URL := $(VIDEOLAN)/libdvdcss/$(DVDCSS_VERSION)/libdvdcss-$(DVDCSS_VERSION).tar.bz2 ifeq ($(call need_pkg,"libdvdcss"),) @@ -14,8 +14,6 @@ $(TARBALLS)/libdvdcss-$(DVDCSS_VERSION).tar.bz2: dvdcss: libdvdcss-$(DVDCSS_VERSION).tar.bz2 .sum-dvdcss $(UNPACK) - $(APPLY) $(SRC)/dvdcss/fix-buffer-overflow.patch - $(APPLY) $(SRC)/dvdcss/fix-uninit-ptr-free.patch $(MOVE) .dvdcss: dvdcss -- 2.11.4.GIT