Skip to content

Commit 9c64ac0

Browse files
committed
Use glib allocator
1 parent c908891 commit 9c64ac0

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

zathura/callbacks.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ gboolean cb_password_dialog(GtkEntry* entry, void* data) {
466466
zathura_password_dialog_info_t* dialog = data;
467467

468468
if (dialog->path == NULL) {
469-
free(dialog);
469+
g_free(dialog);
470470
goto error_ret;
471471
}
472472

@@ -493,7 +493,7 @@ gboolean cb_password_dialog(GtkEntry* entry, void* data) {
493493
} else {
494494
g_free(dialog->path);
495495
g_free(dialog->uri);
496-
free(dialog);
496+
g_free(dialog);
497497
}
498498

499499
g_free(input);
@@ -503,7 +503,7 @@ gboolean cb_password_dialog(GtkEntry* entry, void* data) {
503503
error_free:
504504

505505
g_free(dialog->path);
506-
free(dialog);
506+
g_free(dialog);
507507

508508
error_ret:
509509

zathura/zathura.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ bool document_open(zathura_t* zathura, const char* path, const char* uri, const
941941
if (document == NULL) {
942942
if (error == ZATHURA_ERROR_INVALID_PASSWORD) {
943943
girara_debug("Invalid or no password.");
944-
zathura_password_dialog_info_t* password_dialog_info = malloc(sizeof(zathura_password_dialog_info_t));
944+
zathura_password_dialog_info_t* password_dialog_info = g_try_malloc(sizeof(zathura_password_dialog_info_t));
945945
if (password_dialog_info != NULL) {
946946
password_dialog_info->zathura = zathura;
947947
password_dialog_info->path = g_strdup(path);
@@ -951,7 +951,7 @@ bool document_open(zathura_t* zathura, const char* path, const char* uri, const
951951
gdk_threads_add_idle(document_open_password_dialog, password_dialog_info);
952952
goto error_out;
953953
} else {
954-
free(password_dialog_info);
954+
g_free(password_dialog_info);
955955
}
956956
}
957957
goto error_out;
@@ -1117,7 +1117,7 @@ bool document_open(zathura_t* zathura, const char* path, const char* uri, const
11171117
zathura_document_set_device_factors(document, device_factor, device_factor);
11181118

11191119
/* create blank pages */
1120-
zathura->pages = calloc(number_of_pages, sizeof(GtkWidget*));
1120+
zathura->pages = g_try_malloc0_n(number_of_pages, sizeof(GtkWidget*));
11211121
if (zathura->pages == NULL) {
11221122
goto error_free;
11231123
}
@@ -1415,7 +1415,7 @@ bool document_predecessor_free(zathura_t* zathura) {
14151415
for (unsigned int i = 0; i < zathura_document_get_number_of_pages(zathura->predecessor_document); i++) {
14161416
g_object_unref(zathura->predecessor_pages[i]);
14171417
}
1418-
free(zathura->predecessor_pages);
1418+
g_free(zathura->predecessor_pages);
14191419
zathura->predecessor_pages = NULL;
14201420
girara_debug("freed predecessor pages");
14211421
}
@@ -1510,7 +1510,7 @@ bool document_close(zathura_t* zathura, bool keep_monitor) {
15101510
for (unsigned int i = 0; i < zathura_document_get_number_of_pages(document); i++) {
15111511
g_object_unref(zathura->pages[i]);
15121512
}
1513-
free(zathura->pages);
1513+
g_free(zathura->pages);
15141514
zathura->pages = NULL;
15151515

15161516
/* remove document */

0 commit comments

Comments
 (0)