Skip to content

Commit 2c89c9b

Browse files
committed
Use xmalloc instead of malloc
1 parent cb95ad7 commit 2c89c9b

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

ext/algorithms/string/string.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ long levenshtein_distance(VALUE str1, VALUE str2) {
2626
s1_len++;
2727
s2_len++;
2828

29-
d = malloc(sizeof(typeof(d)) * (s1_len) * (s2_len));
29+
d = xmalloc(sizeof(typeof(d)) * s1_len * s2_len);
3030

3131
for (i = 0; i < s1_len; i++) {
3232
d[i] = i; // d[i, 0] = i
@@ -49,7 +49,7 @@ long levenshtein_distance(VALUE str1, VALUE str2) {
4949
}
5050
}
5151
i = d[s1_len * s2_len -1];
52-
free(d);
52+
xfree(d);
5353
return i;
5454
}
5555

ext/containers/bst/bst.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ static void recursively_free_nodes(bst_node *node) {
172172
if(node) {
173173
recursively_free_nodes(node->left);
174174
recursively_free_nodes(node->right);
175-
free(node);
175+
xfree(node);
176176
}
177177
}
178178

ext/containers/deque/deque.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void free_nodes(deque_node *node) {
1919
deque_node *next;
2020
while(node) {
2121
next = node->right;
22-
free(node);
22+
xfree(node);
2323
node = next;
2424
}
2525
return;
@@ -71,7 +71,7 @@ static void deque_free(void *ptr) {
7171
if (ptr) {
7272
deque *deque = ptr;
7373
free_nodes(deque->front);
74-
free(deque);
74+
xfree(deque);
7575
}
7676
}
7777

ext/containers/rbtree_map/rbtree.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static void recursively_free_nodes(rbtree_node *node) {
3131
if(node) {
3232
recursively_free_nodes(node->left);
3333
recursively_free_nodes(node->right);
34-
free(node);
34+
xfree(node);
3535
}
3636
return;
3737
}
@@ -198,7 +198,7 @@ static rbtree_node* delete_min(rbtree_node *h, VALUE *deleted_value) {
198198
if ( !h->left ) {
199199
if(deleted_value)
200200
*deleted_value = h->value;
201-
free(h);
201+
xfree(h);
202202
return NULL;
203203
}
204204

@@ -216,7 +216,7 @@ static rbtree_node* delete_max(rbtree_node *h, VALUE *deleted_value) {
216216

217217
if ( !h->right ) {
218218
*deleted_value = h->value;
219-
free(h);
219+
xfree(h);
220220
return NULL;
221221
}
222222

@@ -245,7 +245,7 @@ static rbtree_node* delete(rbtree *tree, rbtree_node *node, VALUE key, VALUE *de
245245
cmp = tree->compare_function(key, node->key);
246246
if ( (cmp == 0) && !node->right ) {
247247
*deleted_value = node->value;
248-
free(node);
248+
xfree(node);
249249
return NULL;
250250
}
251251

@@ -339,7 +339,7 @@ static void rbtree_mark(void *ptr) {
339339
}
340340
old = current;
341341
current = current->next;
342-
free(old);
342+
xfree(old);
343343
}
344344
}
345345
}
@@ -349,7 +349,7 @@ static void rbtree_free(void *ptr) {
349349
if (ptr) {
350350
rbtree *tree = ptr;
351351
recursively_free_nodes(tree->root);
352-
free(tree);
352+
xfree(tree);
353353
}
354354
}
355355

ext/containers/splaytree_map/splaytree.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static void recursively_free_nodes(splaytree_node *node) {
2828
if(node) {
2929
recursively_free_nodes(node->left);
3030
recursively_free_nodes(node->right);
31-
free(node);
31+
xfree(node);
3232
}
3333
return;
3434
}
@@ -199,7 +199,7 @@ static splaytree_node* delete(splaytree *tree, splaytree_node *n, VALUE key, VAL
199199
x = splay(tree, n->left, key);
200200
x->right = n->right;
201201
}
202-
free(n);
202+
xfree(n);
203203
if (x) {
204204
x->size = tsize-1;
205205
}
@@ -282,7 +282,7 @@ static void splaytree_mark(void *ptr) {
282282
}
283283
old = current;
284284
current = current->next;
285-
free(old);
285+
xfree(old);
286286
}
287287
}
288288
}
@@ -292,7 +292,7 @@ static void splaytree_free(void *ptr) {
292292
if (ptr) {
293293
splaytree *tree = ptr;
294294
recursively_free_nodes(tree->root);
295-
free(tree);
295+
xfree(tree);
296296
}
297297
}
298298

0 commit comments

Comments
 (0)