diff options
| -rwxr-xr-x | ext/pdo/pdo_dbh.c | 9 | ||||
| -rwxr-xr-x | ext/pdo/pdo_stmt.c | 12 |
2 files changed, 10 insertions, 11 deletions
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 540ed461dd..ec2508290c 100755 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -97,8 +97,7 @@ void pdo_handle_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt TSRMLS_DC) php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", message); if (info) { - zval_dtor(info); - FREE_ZVAL(info); + zval_ptr_dtor(&info); } } else { zval *ex; @@ -572,15 +571,15 @@ static union _zend_function *dbh_method_get(zval *object, char *method_name, int zend_function *fbc; char *lc_method_name; - lc_method_name = do_alloca(method_len + 1); + lc_method_name = emalloc(method_len + 1); zend_str_tolower_copy(lc_method_name, method_name, method_len); if (zend_hash_find(&pdo_dbh_ce->function_table, lc_method_name, method_len+1, (void**)&fbc) == FAILURE) { - free_alloca(lc_method_name); + efree(lc_method_name); return NULL; } - free_alloca(lc_method_name); + efree(lc_method_name); return fbc; } diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index db2f2b8697..b36ea15c13 100755 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -784,15 +784,15 @@ static union _zend_function *dbstmt_method_get(zval *object, char *method_name, zend_function *fbc; char *lc_method_name; - lc_method_name = do_alloca(method_len + 1); + lc_method_name = emalloc(method_len + 1); zend_str_tolower_copy(lc_method_name, method_name, method_len); if (zend_hash_find(&pdo_dbstmt_ce->function_table, lc_method_name, method_len+1, (void**)&fbc) == FAILURE) { - free_alloca(lc_method_name); + efree(lc_method_name); return NULL; } - free_alloca(lc_method_name); + efree(lc_method_name); return fbc; } @@ -1004,15 +1004,15 @@ static union _zend_function *row_method_get(zval *object, char *method_name, int zend_function *fbc; char *lc_method_name; - lc_method_name = do_alloca(method_len + 1); + lc_method_name = emalloc(method_len + 1); zend_str_tolower_copy(lc_method_name, method_name, method_len); if (zend_hash_find(&pdo_row_ce->function_table, lc_method_name, method_len+1, (void**)&fbc) == FAILURE) { - free_alloca(lc_method_name); + efree(lc_method_name); return NULL; } - free_alloca(lc_method_name); + efree(lc_method_name); return fbc; } |