freebsd-ports/graphics/libwmf/files/patch-deb784192-CVE-2015-4696
Jason Unovitch 877dd33328 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
2015-09-07 11:50:19 +00:00

23 lines
453 B
Text

--- 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);
+
wmf_free (API,polyrect.TL);
wmf_free (API,polyrect.BR);
}
@@ -2593,9 +2595,10 @@
polyrect.BR = 0;
polyrect.count = 0;
+
+ if (FR->region_clip) FR->region_clip (API,&polyrect);
}
- if (FR->region_clip) FR->region_clip (API,&polyrect);
return (changed);
}