diff --git a/libraries/libldap/ldifutil.c b/libraries/libldap/ldifutil.c
index 96b13c1131..5bef3eb336 100644
--- a/libraries/libldap/ldifutil.c
+++ b/libraries/libldap/ldifutil.c
@@ -582,8 +582,8 @@ parse_ldif_control(
 	char *s, *oidStart;
 	LDAPControl *newctrl = NULL;
 	LDAPControl **pctrls = NULL;
-	struct berval type, bv;
-	int freeval;
+	struct berval type, bv = BER_BVNULL;
+	int freeval = 0;
 
 	if (ppctrls) pctrls = *ppctrls;
 	/* OID should come first. Validate and extract it. */