Fixed segfaults after change size_t of "s"

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 38e38daf36a0be32f0f790e2a998765b0a8ed4df..151b05902696ffea5dedfaec5c3c1d520ed5f746 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -521,7 +521,7 @@ PHP_FUNCTION(ldap_sasl_bind)
        char *sasl_authz_id = NULL;
        char *sasl_authc_id = NULL;
        char *props = NULL;
-       int rc, dn_len, passwd_len, mech_len, realm_len, authc_id_len, authz_id_len, props_len;
+       size_t rc, dn_len, passwd_len, mech_len, realm_len, authc_id_len, authz_id_len, props_len;
        php_ldap_bictx *ctx;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|sssssss", &link, &binddn, &dn_len, &passwd, &passwd_len, &sasl_mech, &mech_len, &sasl_realm, &realm_len, &sasl_authc_id, &authc_id_len, &sasl_authz_id, &authz_id_len, &props, &props_len) != SUCCESS) {
@@ -1153,7 +1153,8 @@ PHP_FUNCTION(ldap_get_values_len)
        ldap_resultentry *resultentry;
        char *attr;
        struct berval **ldap_value_len;
-       int i, num_values, attr_len;
+       int i, num_values;
+       size_t attr_len;
        
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrs", &link, &result_entry, &attr, &attr_len) != SUCCESS) {
                return;
@@ -1216,7 +1217,8 @@ PHP_FUNCTION(ldap_explode_dn)
 {
        zend_long with_attrib;
        char *dn, **ldap_value;
-       int i, count, dn_len;
+       int i, count;
+       size_t dn_len;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &dn, &dn_len, &with_attrib) != SUCCESS) {
                return;
@@ -1277,7 +1279,8 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
        ldap_linkdata *ld;
        char *dn;
        LDAPMod **ldap_mods;
-       int i, j, num_attribs, num_values, dn_len;
+       int i, j, num_attribs, num_values;
+       size_t dn_len;
        int *num_berval;
        zend_string *attribute;
        zend_ulong index;
@@ -1431,7 +1434,8 @@ PHP_FUNCTION(ldap_delete)
        zval *link;
        ldap_linkdata *ld;
        char *dn;
-       int rc, dn_len;
+       int rc;
+       size_t dn_len;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &link, &dn, &dn_len) != SUCCESS) {
                return;
@@ -1844,7 +1848,7 @@ PHP_FUNCTION(ldap_compare)
 {
        zval *link;
        char *dn, *attr, *value;
-       int dn_len, attr_len, value_len;
+       size_t dn_len, attr_len, value_len;
        ldap_linkdata *ld;
        int errno;
 
@@ -2341,7 +2345,7 @@ PHP_FUNCTION(ldap_rename)
        ldap_linkdata *ld;
        int rc;
        char *dn, *newrdn, *newparent;
-       int dn_len, newrdn_len, newparent_len;
+       size_t dn_len, newrdn_len, newparent_len;
        zend_bool deleteoldrdn;
        
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsssb", &link, &dn, &dn_len, &newrdn, &newrdn_len, &newparent, &newparent_len, &deleteoldrdn) != SUCCESS) {