diff options
| author | Xinchen Hui <laruence@php.net> | 2015-03-25 13:05:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-03-25 13:05:08 +0800 |
| commit | fe0ca2745f00940a27bfc8e87db534541a19af70 (patch) | |
| tree | 9f6ecb6d7dd517f46f71bfc12cdeebd17f8fc904 /ext/mysqlnd/mysqlnd_result.c | |
| parent | ef2db26c60537e84b502608ff404263d5f4dc5d2 (diff) | |
| parent | 968fbc6acf0bc27be17c0209be7f966e89a55943 (diff) | |
| download | php-git-fe0ca2745f00940a27bfc8e87db534541a19af70.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Diffstat (limited to 'ext/mysqlnd/mysqlnd_result.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 0814926483..2b5b892102 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -518,7 +518,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s conn->current_result = NULL; } else { stmt->result = NULL; - memset(stmt, 0, sizeof(MYSQLND_STMT)); + memset(stmt, 0, sizeof(*stmt)); stmt->state = MYSQLND_STMT_INITTED; } } else { @@ -1182,7 +1182,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c No need to FREE_ALLOCA as we can reuse the 'lengths' and 'fields' arrays. For lengths its absolutely safe. 'fields' is reused because the ownership of the strings has been - transfered above. + transferred above. */ } /* Overflow ? */ |