diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-02-01 12:41:00 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-02-01 12:41:00 -0800 |
| commit | f66f5b2ffa76901f62972905f9dd066c7a92b34f (patch) | |
| tree | 9abd771dd56f8c52a89a086cc5d35bf4f244e1da | |
| parent | 6a905a9a3cae60ffb22f7472d9fa977e54c24d5d (diff) | |
| parent | 7efbd70b034890df171cc0c48363f99121f0c19e (diff) | |
| download | php-git-f66f5b2ffa76901f62972905f9dd066c7a92b34f.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix sizeof size
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 25588f7158..96a693c6ee 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -507,7 +507,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 { |