summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-02-01 12:42:00 -0800
committerStanislav Malyshev <stas@php.net>2015-02-01 12:42:00 -0800
commitbf55a4e22378f8a6518fa33f0c2d76f82f5e182b (patch)
tree48b77e58a0e320469ff1622c7f9b3749323cc9fe
parent437719f7ccafabfe67993a1201d0e2562826376f (diff)
parent969e3891216b543414c4931957069bdd9fa7f6cf (diff)
downloadphp-git-bf55a4e22378f8a6518fa33f0c2d76f82f5e182b.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: fix sizeof size
-rw-r--r--ext/mysqlnd/mysqlnd_result.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index e17c8b06b9..4208097cf7 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -556,7 +556,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 {