diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-02-01 12:41:33 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-02-01 12:41:33 -0800 |
| commit | 969e3891216b543414c4931957069bdd9fa7f6cf (patch) | |
| tree | 14c0d1506bfaebc2000345ad58b3d4e8f7f48c4e | |
| parent | 263fb375bdec5f4c9595dd95b091d0f2353e72c0 (diff) | |
| parent | 0bfcc2829c8e0055787633b1afb9779753175594 (diff) | |
| download | php-git-969e3891216b543414c4931957069bdd9fa7f6cf.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 847e032a2a..2fc56e324c 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -626,7 +626,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 { |