diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile
index d1ee27a3f7e1..1cb20112f620 100644
--- a/security/openvpn-auth-ldap/Makefile
+++ b/security/openvpn-auth-ldap/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openvpn-auth-ldap
 PORTVERSION=	2.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	auth-ldap-
 CATEGORIES=	security net-vpn
 
diff --git a/security/openvpn-auth-ldap/files/patch-src_openvpn-cr.c b/security/openvpn-auth-ldap/files/patch-src_openvpn-cr.c
new file mode 100644
index 000000000000..b62c51f90174
--- /dev/null
+++ b/security/openvpn-auth-ldap/files/patch-src_openvpn-cr.c
@@ -0,0 +1,11 @@
+--- src/openvpn-cr.c.orig	2018-07-26 20:17:21 UTC
++++ src/openvpn-cr.c
+@@ -29,7 +29,7 @@ int extract_openvpn_cr(const char *response, openvpn_r
+ 	tokenIndexes[0] = response;
+ 	int tokenCnt = 1;
+ 	const char *p;
+-	for (p = response; *p; ++p) {
++	for (p = response; *p && tokenCnt < 15; ++p) {
+ 		if (*p == ':')
+ 			tokenIndexes[tokenCnt++] = p + 1;
+ 	}