com php-src: mysqlnd_error_info_init() cannot fai l: ext/mysqlnd/mysqlnd_connection.c ext/mysqlnd/mysql nd_connection.h ext/mysqlnd/mysqlnd_driver.c
ext/my sqlnd/mysqlnd_result.c
| From: | Nikita Popov | Date: | Mon, 14 Dec 2020 11:31:45 +0000 |
| Subject: | com php-src: mysqlnd_error_info_init() cannot fai l: ext/mysqlnd/mysqlnd_connection.c ext/mysqlnd/mysql nd_connection.h ext/mysqlnd/mysqlnd_driver.c ext/my sqlnd/mysqlnd_result.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-114435@lists.php.net to get a copy of this message | ||
Commit: 7088cffe8a2643a28aa569c850f247b8e3c0b1e4
Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 14 Dec 2020 12:31:45 +0100
Parents: 35d752f4fca67036b8b1ff5b337cbf31fbf0fe5c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7088cffe8a2643a28aa569c850f247b8e3c0b1e4
Log:
mysqlnd_error_info_init() cannot fail
Changed paths:
M ext/mysqlnd/mysqlnd_connection.c
M ext/mysqlnd/mysqlnd_connection.h
M ext/mysqlnd/mysqlnd_driver.c
M ext/mysqlnd/mysqlnd_result.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c
index 1c7e25dbb5d..21eb7e703be 100644
--- a/ext/mysqlnd/mysqlnd_connection.c
+++ b/ext/mysqlnd/mysqlnd_connection.c
@@ -146,7 +146,7 @@ MYSQLND_CLASS_METHODS_END;
/* {{{ mysqlnd_error_info_init */
-PHPAPI enum_func_status
+PHPAPI void
mysqlnd_error_info_init(MYSQLND_ERROR_INFO * const info, const zend_bool persistent)
{
DBG_ENTER("mysqlnd_error_info_init");
@@ -155,7 +155,7 @@ mysqlnd_error_info_init(MYSQLND_ERROR_INFO * const info, const zend_bool persist
zend_llist_init(&info->error_list, sizeof(MYSQLND_ERROR_LIST_ELEMENT), (llist_dtor_func_t)
mysqlnd_error_list_pdtor, persistent);
info->persistent = persistent;
- DBG_RETURN(PASS);
+ DBG_VOID_RETURN;
}
/* }}} */
diff --git a/ext/mysqlnd/mysqlnd_connection.h b/ext/mysqlnd/mysqlnd_connection.h
index 795ec3c5ea3..412913e6a74 100644
--- a/ext/mysqlnd/mysqlnd_connection.h
+++ b/ext/mysqlnd/mysqlnd_connection.h
@@ -65,7 +65,7 @@ void mysqlnd_upsert_status_init(MYSQLND_UPSERT_STATUS * const upsert_status);
}
-PHPAPI enum_func_status mysqlnd_error_info_init(MYSQLND_ERROR_INFO * const info, const zend_bool
persistent);
+PHPAPI void mysqlnd_error_info_init(MYSQLND_ERROR_INFO * const info, const zend_bool persistent);
PHPAPI void mysqlnd_error_info_free_contents(MYSQLND_ERROR_INFO * const info);
#define GET_CONNECTION_STATE(state_struct) (state_struct)->m->get((state_struct))
diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c
index 61a03fea29c..d5e2dc7cd61 100644
--- a/ext/mysqlnd/mysqlnd_driver.c
+++ b/ext/mysqlnd/mysqlnd_driver.c
@@ -116,10 +116,7 @@ MYSQLND_METHOD(mysqlnd_object_factory,
get_connection)(MYSQLND_CLASS_METHODS_TYP
new_object->m = mysqlnd_conn_get_methods();
data = new_object->data;
- if (FAIL == mysqlnd_error_info_init(&data->error_info_impl, persistent)) {
- new_object->m->dtor(new_object);
- DBG_RETURN(NULL);
- }
+ mysqlnd_error_info_init(&data->error_info_impl, persistent);
data->error_info = &data->error_info_impl;
data->options = &(data->options_impl);
@@ -191,44 +188,29 @@ MYSQLND_METHOD(mysqlnd_object_factory,
get_prepared_statement)(MYSQLND_CONN_DATA
MYSQLND_STMT_DATA * stmt = NULL;
DBG_ENTER("mysqlnd_object_factory::get_prepared_statement");
- do {
- ret->m = mysqlnd_stmt_get_methods();
+ ret->m = mysqlnd_stmt_get_methods();
- stmt = ret->data = mnd_ecalloc(1, sizeof(MYSQLND_STMT_DATA));
- DBG_INF_FMT("stmt=%p", stmt);
+ stmt = ret->data = mnd_ecalloc(1, sizeof(MYSQLND_STMT_DATA));
+ DBG_INF_FMT("stmt=%p", stmt);
- if (FAIL == mysqlnd_error_info_init(&stmt->error_info_impl, 0)) {
- break;
- }
- stmt->error_info = &stmt->error_info_impl;
-
- mysqlnd_upsert_status_init(&stmt->upsert_status_impl);
- stmt->upsert_status = &(stmt->upsert_status_impl);
- stmt->state = MYSQLND_STMT_INITTED;
- stmt->execute_cmd_buffer.length = 4096;
- stmt->execute_cmd_buffer.buffer = mnd_emalloc(stmt->execute_cmd_buffer.length);
- if (!stmt->execute_cmd_buffer.buffer) {
- break;
- }
+ mysqlnd_error_info_init(&stmt->error_info_impl, 0);
+ stmt->error_info = &stmt->error_info_impl;
- stmt->prefetch_rows = MYSQLND_DEFAULT_PREFETCH_ROWS;
+ mysqlnd_upsert_status_init(&stmt->upsert_status_impl);
+ stmt->upsert_status = &(stmt->upsert_status_impl);
+ stmt->state = MYSQLND_STMT_INITTED;
+ stmt->execute_cmd_buffer.length = 4096;
+ stmt->execute_cmd_buffer.buffer = mnd_emalloc(stmt->execute_cmd_buffer.length);
+ stmt->prefetch_rows = MYSQLND_DEFAULT_PREFETCH_ROWS;
- /*
- Mark that we reference the connection, thus it won't be
- be destructed till there is open statements. The last statement
- or normal query result will close it then.
- */
- stmt->conn = conn->m->get_reference(conn);
+ /*
+ Mark that we reference the connection, thus it won't be
+ be destructed till there is open statements. The last statement
+ or normal query result will close it then.
+ */
+ stmt->conn = conn->m->get_reference(conn);
- DBG_RETURN(ret);
- } while (0);
-
- SET_OOM_ERROR(conn->error_info);
- if (ret) {
- ret->m->dtor(ret, TRUE);
- ret = NULL;
- }
- DBG_RETURN(NULL);
+ DBG_RETURN(ret);
}
/* }}} */
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 277b3204f7a..bfcff5a088d 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -1388,17 +1388,9 @@ MYSQLND_METHOD(mysqlnd_res, store_result)(MYSQLND_RES * result,
if (flags & MYSQLND_STORE_NO_COPY) {
result->stored_data = (MYSQLND_RES_BUFFERED *) mysqlnd_result_buffered_zval_init(result,
result->field_count, flags & MYSQLND_STORE_PS);
- if (!result->stored_data) {
- SET_OOM_ERROR(conn->error_info);
- DBG_RETURN(NULL);
- }
row_buffers = &result->stored_data->row_buffers;
} else if (flags & MYSQLND_STORE_COPY) {
result->stored_data = (MYSQLND_RES_BUFFERED *) mysqlnd_result_buffered_c_init(result,
result->field_count, flags & MYSQLND_STORE_PS);
- if (!result->stored_data) {
- SET_OOM_ERROR(conn->error_info);
- DBG_RETURN(NULL);
- }
row_buffers = &result->stored_data->row_buffers;
}
ret = result->m.store_result_fetch_data(conn, result, result->meta, row_buffers, flags &
MYSQLND_STORE_PS);
@@ -1965,9 +1957,7 @@ mysqlnd_result_buffered_zval_init(MYSQLND_RES * result, const unsigned int
field
ret = pool->get_chunk(pool, alloc_size);
memset(ret, 0, alloc_size);
- if (FAIL == mysqlnd_error_info_init(&ret->error_info, 0)) {
- DBG_RETURN(NULL);
- }
+ mysqlnd_error_info_init(&ret->error_info, /* persistent */ 0);
ret->lengths = pool->get_chunk(pool, field_count * sizeof(size_t));
memset(ret->lengths, 0, field_count * sizeof(size_t));
@@ -2006,9 +1996,7 @@ mysqlnd_result_buffered_c_init(MYSQLND_RES * result, const unsigned int
field_co
ret = pool->get_chunk(pool, alloc_size);
memset(ret, 0, alloc_size);
- if (FAIL == mysqlnd_error_info_init(&ret->error_info, 0)) {
- DBG_RETURN(NULL);
- }
+ mysqlnd_error_info_init(&ret->error_info, /* persistent */ 0);
ret->lengths = pool->get_chunk(pool, field_count * sizeof(size_t));
memset(ret->lengths, 0, field_count * sizeof(size_t));