Skip to content

Commit ca91bf4

Browse files
sodabrewjustincase
authored andcommitted
Use xfree after xmalloc/xcalloc
1 parent 97507de commit ca91bf4

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

ext/mysql2/result.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,16 @@ static void rb_mysql_result_free_result(mysql2_result_wrapper * wrapper) {
9090
if (wrapper->stmt) {
9191
mysql_stmt_free_result(wrapper->stmt);
9292

93-
if(wrapper->result_buffers) {
94-
for(i = 0; i < wrapper->numberOfFields; i++) {
93+
if (wrapper->result_buffers) {
94+
for (i = 0; i < wrapper->numberOfFields; i++) {
9595
if (wrapper->result_buffers[i].buffer) {
96-
free(wrapper->result_buffers[i].buffer);
96+
xfree(wrapper->result_buffers[i].buffer);
9797
}
9898
}
99-
free(wrapper->result_buffers);
100-
free(wrapper->is_null);
101-
free(wrapper->error);
102-
free(wrapper->length);
99+
xfree(wrapper->result_buffers);
100+
xfree(wrapper->is_null);
101+
xfree(wrapper->error);
102+
xfree(wrapper->length);
103103
}
104104
}
105105
/* FIXME: this may call flush_use_result, which can hit the socket */
@@ -292,7 +292,7 @@ static void rb_mysql_result_alloc_result_buffers(VALUE self, MYSQL_FIELD *fields
292292
case MYSQL_TYPE_SET: // char[]
293293
case MYSQL_TYPE_ENUM: // char[]
294294
case MYSQL_TYPE_GEOMETRY: // char[]
295-
wrapper->result_buffers[i].buffer = malloc(fields[i].max_length);
295+
wrapper->result_buffers[i].buffer = xmalloc(fields[i].max_length);
296296
wrapper->result_buffers[i].buffer_length = fields[i].max_length;
297297
break;
298298
default:

0 commit comments

Comments
 (0)