gentoo/alpha-quadrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

media-libs/exempi-2.5.0 added.

Browse Source
This commit is contained in:
Micha Glave
2020-06-10 16:52:46 +02:00
parent 1b014d8ba9
commit e763b2c09c
4 changed files with 146 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
media-libs/exempi/files/exempi-2.4.2-iconv.patch Normal file
View File

@@ -0,0 +1,41 @@
From a2b822c85c52c96b04192a4923c9edbf9d144343 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Sun, 16 Apr 2017 20:11:57 +0200
Subject: [PATCH] Fix build on systems not using glibc's libiconv
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=242812
Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
---
XMPFiles/source/Makefile.am | 3 ++-
configure.ac | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/XMPFiles/source/Makefile.am b/XMPFiles/source/Makefile.am
index 6d1a1d3..d1020d0 100644
--- a/XMPFiles/source/Makefile.am
+++ b/XMPFiles/source/Makefile.am
@@ -53,5 +53,6 @@ libXMPFiles_la_SOURCES = WXMPFiles.cpp XMPFiles.cpp \
libXMPFiles_la_LIBADD = ./FileHandlers/libxmpfilehandlers.la \
./FormatSupport/libformatsupport.la \
./PluginHandler/libpluginhandler.la \
- ./NativeMetadataSupport/libnativemetadata.la
+ ./NativeMetadataSupport/libnativemetadata.la \
+ @LTLIBICONV@
#libXMPFiles_la_LDFLAGS = -version-info @LIBXMPCORE_VERSION_INFO@
diff --git a/configure.ac b/configure.ac
index a4ee14f..e1033c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,6 +115,8 @@ AC_CHECK_HEADER(iconv.h, ,
AC_CHECK_HEADER(zlib.h, ,
AC_MSG_ERROR([zlib headers missing]))
+AM_ICONV_LINK
+
dnl Blatently copied from iconv.m4 to remove the crack about libtool
dnl But check for constness of the iconv parameters.
AC_MSG_CHECKING([for iconv declaration])
--
2.12.2

42
media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch Normal file
View File

@@ -0,0 +1,42 @@
From 8ed2f034705fd2d032c81383eee8208fd4eee0ac Mon Sep 17 00:00:00 2001
From: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
Date: Sat, 18 Aug 2018 13:54:55 +0000
Subject: [PATCH] Issue #9 - Fix null-pointer-dereference (CVE-2018-12648)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The WEBP::GetLE32 function in
XMPFiles/source/FormatSupport/WEBP_Support.hpp in Exempi 2.4.5 has a
NULL pointer dereference.
https://bugs.freedesktop.org/show_bug.cgi?id=106981
https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
Signed-off-by: Hubert Figuière <hub@figuiere.net>
---
XMPFiles/source/FormatSupport/WEBP_Support.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
index ffaf220..4fe705b 100644
--- a/XMPFiles/source/FormatSupport/WEBP_Support.cpp
+++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
@@ -160,9 +160,11 @@ bool VP8XChunk::xmp()
}
void VP8XChunk::xmp(bool hasXMP)
{
- XMP_Uns32 flags = GetLE32(&this->data[0]);
- flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
- PutLE32(&this->data[0], flags);
+ if (&this->data[0] != NULL) {
+ XMP_Uns32 flags = GetLE32(&this->data[0]);
+ flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
+ PutLE32(&this->data[0], flags);
+ }
}
Container::Container(WEBP_MetaHandler* handler) : Chunk(NULL, handler)
--
2.18.0