Index: branches/2018Q2/graphics/freeimage/Makefile
===================================================================
--- branches/2018Q2/graphics/freeimage/Makefile	(revision 467797)
+++ branches/2018Q2/graphics/freeimage/Makefile	(revision 467798)
@@ -1,62 +1,62 @@
 # Created by: Choe, Cheng-Dae <whitekid@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	freeimage
 PORTVERSION=	3.16.0
-PORTREVISION=	4
+PORTREVISION=	5
 # Version 3.17.0 is available, but does not build on i386 (and probably
 # other 32-bit arches) without some not-quite-trivial patching.  If one
 # decides to update the port, please make sure 32-bit builds are tested!
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Source%20Distribution/${PORTVERSION}
 DISTNAME=	FreeImage${PORTVERSION:S/.//g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple C/C++ bitmap graphics library
 
 USES=		dos2unix gmake zip
 DOS2UNIX_FILES=	Source/LibOpenJPEG/opj_malloc.h \
 		Source/LibRawLite/dcraw/dcraw.c \
 		Source/LibRawLite/internal/dcraw_common.cpp
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/FreeImage
 MAKE_ARGS=	CC="${CC}" CPP="${CPP}" CXX="${CXX}"
 
 CFLAGS+=	-DPNG_ARM_NEON_OPT=0 -fexceptions -fvisibility=hidden
 CFLAGS_aarch64=	-fPIC
 CFLAGS_amd64=	-fPIC
 
 PLIST_FILES=	include/FreeImage.h \
 		include/FreeImagePlus.h \
 		lib/libfreeimage.a \
 		lib/libfreeimage-${PORTVERSION}.so \
 		lib/libfreeimage.so.3 \
 		lib/libfreeimage.so \
 		lib/libfreeimageplus.a \
 		lib/libfreeimageplus-${PORTVERSION}.so \
 		lib/libfreeimageplus.so.3 \
 		lib/libfreeimageplus.so
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == powerpc
 USES+=		compiler:c++0x
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}| ; s|-o root -g root ||' \
 		${WRKSRC}/Makefile.gnu ${WRKSRC}/Makefile.fip
 
 post-build:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile.fip ${_MAKE_JOBS} \
 		${MAKE_ARGS} -C ${BUILD_WRKSRC}
 
 post-install:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile.fip ${MAKE_ARGS} \
 		-C ${INSTALL_WRKSRC} ${INSTALL_TARGET}
 	${LN} -sf libfreeimageplus.so.3 \
 		${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so
 	${LN} -sf libfreeimageplus-${PORTVERSION}.so \
 		${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so.3
 
 .include <bsd.port.mk>
Index: branches/2018Q2/graphics/freeimage/files/patch-Source-FreeImage-PluginXPM.cpp
===================================================================
--- branches/2018Q2/graphics/freeimage/files/patch-Source-FreeImage-PluginXPM.cpp	(nonexistent)
+++ branches/2018Q2/graphics/freeimage/files/patch-Source-FreeImage-PluginXPM.cpp	(revision 467798)
@@ -0,0 +1,23 @@
+--- Source/FreeImage/PluginXPM.cpp.orig	2013-11-29 19:29:14 UTC
++++ Source/FreeImage/PluginXPM.cpp
+@@ -181,6 +181,11 @@ Load(FreeImageIO *io, fi_handle handle, 
+ 		}
+ 		free(str);
+ 
++		// check info string
++		if((width <= 0) || (height <= 0) || (colors <= 0) || (cpp <= 0)) {
++			throw "Improperly formed info string";
++		}
++
+         if (colors > 256) {
+ 			dib = FreeImage_AllocateHeader(header_only, width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
+ 		} else {
+@@ -193,7 +198,7 @@ Load(FreeImageIO *io, fi_handle handle, 
+ 			FILE_RGBA rgba;
+ 
+ 			str = ReadString(io, handle);
+-			if(!str)
++			if(!str || (strlen(str) < (size_t)cpp))
+ 				throw "Error reading color strings";
+ 
+ 			std::string chrs(str,cpp); //create a string for the color chars using the first cpp chars

Property changes on: branches/2018Q2/graphics/freeimage/files/patch-Source-FreeImage-PluginXPM.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 467797)
+++ branches/2018Q2	(revision 467798)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r467404