Skip to content

Commit f84adc3

Browse files
committed
correct uses of memset
1 parent f6c1c29 commit f84adc3

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

mysql/mysql.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ int mysql_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_backend
8282
if (mysql_stmt_num_rows(backend->st_read_header) == 1) {
8383
result_buffers[0].buffer_type = MYSQL_TYPE_TINY;
8484
result_buffers[0].buffer = type_p;
85-
result_buffers[0].buffer_length = sizeof(type_p);
86-
memset(type_p, 0, sizeof(type_p));
85+
result_buffers[0].buffer_length = sizeof(*type_p);
86+
memset(type_p, 0, sizeof(*type_p));
8787

8888
result_buffers[1].buffer_type = MYSQL_TYPE_LONGLONG;
8989
result_buffers[1].buffer = len_p;
90-
result_buffers[1].buffer_length = sizeof(len_p);
91-
memset(len_p, 0, sizeof(len_p));
90+
result_buffers[1].buffer_length = sizeof(*len_p);
91+
memset(len_p, 0, sizeof(*len_p));
9292

9393
if(mysql_stmt_bind_result(backend->st_read_header, result_buffers) != 0)
9494
return GIT_ERROR;
@@ -145,13 +145,13 @@ int mysql_backend__read(void **data_p, size_t *len_p, git_otype *type_p, git_odb
145145
if (mysql_stmt_num_rows(backend->st_read) == 1) {
146146
result_buffers[0].buffer_type = MYSQL_TYPE_TINY;
147147
result_buffers[0].buffer = type_p;
148-
result_buffers[0].buffer_length = sizeof(type_p);
149-
memset(type_p, 0, sizeof(type_p));
148+
result_buffers[0].buffer_length = sizeof(*type_p);
149+
memset(type_p, 0, sizeof(*type_p));
150150

151151
result_buffers[1].buffer_type = MYSQL_TYPE_LONGLONG;
152152
result_buffers[1].buffer = len_p;
153-
result_buffers[1].buffer_length = sizeof(len_p);
154-
memset(len_p, 0, sizeof(len_p));
153+
result_buffers[1].buffer_length = sizeof(*len_p);
154+
memset(len_p, 0, sizeof(*len_p));
155155

156156
// by setting buffer and buffer_length to 0, this tells libmysql
157157
// we want it to set data_len to the *actual* length of that field

0 commit comments

Comments
 (0)