mirror of
https://github.com/php/php-src.git
synced 2025-08-19 08:49:28 +02:00
- Reverted emalloc(),efree() changed for persistant connection resources
This commit is contained in:
parent
7af6973d43
commit
5ab857c8b9
1 changed files with 4 additions and 4 deletions
|
@ -308,7 +308,7 @@ EXEC SQL END DECLARE SECTION;
|
||||||
EXEC SQL close database;
|
EXEC SQL close database;
|
||||||
EXEC SQL DISCONNECT CURRENT;
|
EXEC SQL DISCONNECT CURRENT;
|
||||||
}
|
}
|
||||||
efree(link);
|
free(link);
|
||||||
IFXG(num_persistent)--;
|
IFXG(num_persistent)--;
|
||||||
IFXG(num_links)--;
|
IFXG(num_links)--;
|
||||||
}
|
}
|
||||||
|
@ -495,7 +495,7 @@ EXEC SQL END DECLARE SECTION;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* create the link */
|
/* create the link */
|
||||||
ifx = (char *) emalloc(sizeof(IFX));
|
ifx = (char *) malloc(sizeof(IFX));
|
||||||
IFXG(connectionid)++;
|
IFXG(connectionid)++;
|
||||||
sprintf(ifx, "%s%x", SAFE_STRING(user), IFXG(connectionid));
|
sprintf(ifx, "%s%x", SAFE_STRING(user), IFXG(connectionid));
|
||||||
|
|
||||||
|
@ -504,7 +504,7 @@ EXEC SQL END DECLARE SECTION;
|
||||||
if (ifx_check() == IFX_ERROR) {
|
if (ifx_check() == IFX_ERROR) {
|
||||||
IFXG(sv_sqlcode) = SQLCODE;
|
IFXG(sv_sqlcode) = SQLCODE;
|
||||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ifx_error(ifx));
|
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ifx_error(ifx));
|
||||||
efree(ifx);
|
free(ifx);
|
||||||
efree(hashed_details);
|
efree(hashed_details);
|
||||||
RETURN_FALSE;
|
RETURN_FALSE;
|
||||||
}
|
}
|
||||||
|
@ -513,7 +513,7 @@ EXEC SQL END DECLARE SECTION;
|
||||||
new_le.type = le_plink;
|
new_le.type = le_plink;
|
||||||
new_le.ptr = ifx;
|
new_le.ptr = ifx;
|
||||||
if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length + 1, (void *) &new_le, sizeof(list_entry), NULL) == FAILURE) {
|
if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length + 1, (void *) &new_le, sizeof(list_entry), NULL) == FAILURE) {
|
||||||
efree(ifx);
|
free(ifx);
|
||||||
efree(hashed_details);
|
efree(hashed_details);
|
||||||
RETURN_FALSE;
|
RETURN_FALSE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue