Attachment #224429 for bug #255401

Lines 1-8 Link Here

(-)b/multimedia/libdvdcss/Makefile (-3 / +2 lines)
1	# Created by: ijliao	1	# Created by: ijliao
2		2
3	PORTNAME= libdvdcss	3	PORTNAME= libdvdcss
4	DISTVERSION= 1.4.2	4	DISTVERSION= 1.4.3
5	PORTREVISION= 2
6	CATEGORIES= multimedia	5	CATEGORIES= multimedia
7	MASTER_SITES= https://download.videolan.org/pub/${PORTNAME}/${DISTVERSION}/	6	MASTER_SITES= https://download.videolan.org/pub/${PORTNAME}/${DISTVERSION}/
8		7
Lines 20-26 GNU_CONFIGURE= yes Link Here
20	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
21	INSTALL_TARGET= install-strip	20	INSTALL_TARGET= install-strip
22		21
23	PORTDOCS= *	22	PORTDOCS= AUTHORS COPYING ChangeLog NEWS README
24		23
25	OPTIONS_DEFINE= DOXYGEN DOCS	24	OPTIONS_DEFINE= DOXYGEN DOCS
26		25

Lines 1-3 Link Here

(-)b/multimedia/libdvdcss/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1538967502	1	TIMESTAMP = 1619377457
2	SHA256 (libdvdcss-1.4.2.tar.bz2) = 78c2ed77ec9c0d8fbed7bf7d3abc82068b8864be494cfad165821377ff3f2575	2	SHA256 (libdvdcss-1.4.3.tar.bz2) = 233cc92f5dc01c5d3a96f5b3582be7d5cee5a35a52d3a08158745d3d86070079
3	SIZE (libdvdcss-1.4.2.tar.bz2) = 366824	3	SIZE (libdvdcss-1.4.3.tar.bz2) = 388404




--- src/libdvdcss.c.orig	2018-03-02 15:44:29 UTC
+++ src/libdvdcss.c
@@ -320,7 +320,19 @@ static int init_cache_dir( dvdcss_t dvdcss )
         return -1;
     }
 
-    sprintf( psz_tagfile, "%s/" CACHE_TAG_NAME, dvdcss->psz_cachefile );
+    i_ret = snprintf( psz_tagfile, PATH_MAX, "%s/" CACHE_TAG_NAME,
+                      dvdcss->psz_cachefile );
+    if ( i_ret < 0 || i_ret >= PATH_MAX)
+    {
+        if ( i_ret < 0)
+            print_error( dvdcss, "failed to compose cache directory tag path");
+        else
+            print_error( dvdcss, "cache directory tag path too long: %s/" CACHE_TAG_NAME,
+                         dvdcss->psz_cachefile );
+        dvdcss->psz_cachefile[0] = '\0';
+        return -1;
+    }
+
     i_fd = open( psz_tagfile, O_RDWR|O_CREAT, 0644 );
     if( i_fd >= 0 )
     {

Return to bug 255401

Removed Link Here

(-)a/multimedia/libdvdcss/files/patch-src_libdvdcss.c (-23 lines)
1	--- src/libdvdcss.c.orig 2018-03-02 15:44:29 UTC
2	+++ src/libdvdcss.c
3	@@ -320,7 +320,19 @@ static int init_cache_dir( dvdcss_t dvdcss )
4	return -1;
5	}
6
7	- sprintf( psz_tagfile, "%s/" CACHE_TAG_NAME, dvdcss->psz_cachefile );
8	+ i_ret = snprintf( psz_tagfile, PATH_MAX, "%s/" CACHE_TAG_NAME,
9	+ dvdcss->psz_cachefile );
10	+ if ( i_ret < 0 \|\| i_ret >= PATH_MAX)
11	+ {
12	+ if ( i_ret < 0)
13	+ print_error( dvdcss, "failed to compose cache directory tag path");
14	+ else
15	+ print_error( dvdcss, "cache directory tag path too long: %s/" CACHE_TAG_NAME,
16	+ dvdcss->psz_cachefile );
17	+ dvdcss->psz_cachefile[0] = '\0';
18	+ return -1;
19	+ }
20	+
21	i_fd = open( psz_tagfile, O_RDWR\|O_CREAT, 0644 );
22	if( i_fd >= 0 )
23	{