diff options
| author | junovitch <junovitch@FreeBSD.org> | 2015-09-07 19:50:19 +0800 |
|---|---|---|
| committer | junovitch <junovitch@FreeBSD.org> | 2015-09-07 19:50:19 +0800 |
| commit | e09805bfdf6e9baef7d5620dc6580dc199ab8c57 (patch) | |
| tree | 7dd1a1cea73609707b70e70009fb4b29dc74ee32 | |
| parent | aac1b193cc1eafd34a9e35dbd0cef88164c8d537 (diff) | |
| download | freebsd-ports-gnome-e09805bfdf6e9baef7d5620dc6580dc199ab8c57.tar.gz freebsd-ports-gnome-e09805bfdf6e9baef7d5620dc6580dc199ab8c57.tar.zst freebsd-ports-gnome-e09805bfdf6e9baef7d5620dc6580dc199ab8c57.zip | |
graphics/libwmf: Fix bug introduced by patch for CVE-2015-4696
- The original CVE-2015-4696 patch from upstream was missing line numbers
in the first patch hunk. The security issue was resolved by the
restructured code but a new potential bug was introduced in the process.
- While here, update to my FreeBSD.org email
PR: 201513
Reported by: Sevan Janiyan <venture37@geeklan.co.uk>
Obtained from: Fedora libwmf RPM git (commit c8bc53c1)
Approved by: feld (mentor)
MFH: 2015Q3
| -rw-r--r-- | graphics/libwmf/Makefile | 4 | ||||
| -rw-r--r-- | graphics/libwmf/files/patch-deb784192-CVE-2015-4696 | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index f883a1a083d2..c084c15c8e86 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -3,11 +3,11 @@ PORTNAME= libwmf PORTVERSION= 0.2.8.4 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics MASTER_SITES= SF/wvware/${PORTNAME}/${PORTVERSION} -MAINTAINER= jason.unovitch@gmail.com +MAINTAINER= junovitch@FreeBSD.org COMMENT= Tools and library for converting Microsoft WMF (windows metafile) LICENSE= GPLv2 # or later diff --git a/graphics/libwmf/files/patch-deb784192-CVE-2015-4696 b/graphics/libwmf/files/patch-deb784192-CVE-2015-4696 index f4b3a03b57ab..7d6226c2f2f3 100644 --- a/graphics/libwmf/files/patch-deb784192-CVE-2015-4696 +++ b/graphics/libwmf/files/patch-deb784192-CVE-2015-4696 @@ -1,5 +1,8 @@ --- src/player/meta.h +++ src/player/meta.h +@@ -2585,6 +2585,8 @@ + polyrect.BR[i] = clip->rects[i].BR; + } + if (FR->region_clip) FR->region_clip (API,&polyrect); + |