diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2016-01-23 13:35:22 -0500 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2016-01-23 13:37:04 -0500 |
| commit | c2c3350ada353ca2c523210909a4fea07fcc5a10 (patch) | |
| tree | b9f354ff68ccb4d166dcc5ea2dbdc1da7e2e31fa /media-libs/plib/files | |
| parent | sys-kernel/gentoo-sources: Fix header (diff) | |
| download | gentoo-c2c3350ada353ca2c523210909a4fea07fcc5a10.tar.gz gentoo-c2c3350ada353ca2c523210909a4fea07fcc5a10.tar.bz2 gentoo-c2c3350ada353ca2c523210909a4fea07fcc5a10.zip | |
media-libs/plib: add patches from Debian (bug #395553 and bug #440762)
Package-Manager: portage-2.2.26
Diffstat (limited to 'media-libs/plib/files')
| -rw-r--r-- | media-libs/plib/files/plib-1.8.5-CVE-2011-4552.patch | 54 | ||||
| -rw-r--r-- | media-libs/plib/files/plib-1.8.5-CVE-2011-4620.patch | 11 | ||||
| -rw-r--r-- | media-libs/plib/files/plib-1.8.5-X11.patch | 4 |
3 files changed, 67 insertions, 2 deletions
diff --git a/media-libs/plib/files/plib-1.8.5-CVE-2011-4552.patch b/media-libs/plib/files/plib-1.8.5-CVE-2011-4552.patch new file mode 100644 index 000000000000..78f1b22ae129 --- /dev/null +++ b/media-libs/plib/files/plib-1.8.5-CVE-2011-4552.patch @@ -0,0 +1,54 @@ +--- plib-1.8.5/src/ssg/ssgParser.cxx~ ++++ plib-1.8.5/src/ssg/ssgParser.cxx +@@ -57,18 +57,16 @@ void _ssgParser::error( const char *form + char msgbuff[ 255 ]; + va_list argp; + +- char* msgptr = msgbuff; +- if (linenum) +- { +- msgptr += sprintf ( msgptr,"%s, line %d: ", +- path, linenum ); +- } +- + va_start( argp, format ); +- vsprintf( msgptr, format, argp ); ++ vsnprintf( msgbuff, sizeof(msgbuff), format, argp ); + va_end( argp ); + +- ulSetError ( UL_WARNING, "%s", msgbuff ) ; ++ if (linenum) ++ { ++ ulSetError ( UL_WARNING, "%s, line %d: %s", path, linenum, msgbuff ) ; ++ } else { ++ ulSetError ( UL_WARNING, "%s", msgbuff ) ; ++ } + } + + +@@ -78,18 +76,16 @@ void _ssgParser::message( const char *fo + char msgbuff[ 255 ]; + va_list argp; + +- char* msgptr = msgbuff; +- if (linenum) +- { +- msgptr += sprintf ( msgptr,"%s, line %d: ", +- path, linenum ); +- } +- + va_start( argp, format ); +- vsprintf( msgptr, format, argp ); ++ vsnprintf( msgbuff, sizeof(msgbuff), format, argp ); + va_end( argp ); + +- ulSetError ( UL_DEBUG, "%s", msgbuff ) ; ++ if (linenum) ++ { ++ ulSetError ( UL_DEBUG, "%s, line %d: %s", path, linenum, msgbuff ) ; ++ } else { ++ ulSetError ( UL_DEBUG, "%s", msgbuff ) ; ++ } + } + + // Opens the file and does a few internal calculations based on the spec. diff --git a/media-libs/plib/files/plib-1.8.5-CVE-2011-4620.patch b/media-libs/plib/files/plib-1.8.5-CVE-2011-4620.patch new file mode 100644 index 000000000000..41fac5fe4c66 --- /dev/null +++ b/media-libs/plib/files/plib-1.8.5-CVE-2011-4620.patch @@ -0,0 +1,11 @@ +--- plib-1.8.5/src/util/ulError.cxx~ 2008-03-11 03:06:23.000000000 +0100 ++++ plib-1.8.5/src/util/ulError.cxx 2011-12-27 15:38:25.305676650 +0100 +@@ -39,7 +39,7 @@ void ulSetError ( enum ulSeverity severi + { + va_list argp; + va_start ( argp, fmt ) ; +- vsprintf ( _ulErrorBuffer, fmt, argp ) ; ++ vsnprintf ( _ulErrorBuffer, sizeof(_ulErrorBuffer), fmt, argp ) ; + va_end ( argp ) ; + + if ( _ulErrorCB ) diff --git a/media-libs/plib/files/plib-1.8.5-X11.patch b/media-libs/plib/files/plib-1.8.5-X11.patch index 86bccc31c0e6..1d9e05360d37 100644 --- a/media-libs/plib/files/plib-1.8.5-X11.patch +++ b/media-libs/plib/files/plib-1.8.5-X11.patch @@ -1,5 +1,5 @@ ---- configure.in.old 2014-10-14 12:23:00.422971952 +0200 -+++ configure.in 2014-10-14 12:23:24.806746868 +0200 +--- configure.in.old ++++ configure.in @@ -276,7 +276,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" |