Fix potentially uninitialized use in ldap

nikic · nikic · commit 48ff226caeae · 2019-08-29T19:07:45.000+02:00
If ctrl-&gt;ldctl_value.bv_len is zero context is uninitialized. Only
free it if the call took place and succeeded.
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
@@ -265,10 +265,10 @@ static void _php_ldap_control_to_array(LDAP *ld, LDAPControl* ctrl, zval* array,
 				add_assoc_stringl(&value, "context", context->bv_val, context->bv_len);
 			}
 			add_assoc_zval(array, "value", &value);
+			ber_bvfree(context);
 		} else {
 			add_assoc_null(array, "value");
 		}
-		ber_bvfree(context);
 	} else {
 		if (ctrl->ldctl_value.bv_len) {
 			add_assoc_stringl(array, "value", ctrl->ldctl_value.bv_val, ctrl->ldctl_value.bv_len);

Original file line number	Diff line number	Diff line change
`@@ -265,10 +265,10 @@ static void _php_ldap_control_to_array(LDAP ld, LDAPControl ctrl, zval* array,`
`265`	`265`	`add_assoc_stringl(&value, "context", context->bv_val, context->bv_len);`
`266`	`266`	`}`
`267`	`267`	`add_assoc_zval(array, "value", &value);`
	`268`	`+ ber_bvfree(context);`
`268`	`269`	`} else {`
`269`	`270`	`add_assoc_null(array, "value");`
`270`	`271`	`}`
`271`		`- ber_bvfree(context);`
`272`	`272`	`} else {`
`273`	`273`	`if (ctrl->ldctl_value.bv_len) {`
`274`	`274`	`add_assoc_stringl(array, "value", ctrl->ldctl_value.bv_val, ctrl->ldctl_value.bv_len);`