mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-02 07:15:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace unchecked allocations with calls to xmalloc.h functions

Browse source
This commit is contained in:
Craig Barnes 2024-01-25 07:03:50 +00:00
parent 43e27a8843
commit 91b22ae21a
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
char32.c
View file

@ -129,11 +129,11 @@ UNITTEST
UNITTEST UNITTEST
{ {
char32_t *c = c32dup(U"foobar"); char32_t *c = xc32dup(U"foobar");
xassert(c32cmp(c, U"foobar") == 0); xassert(c32cmp(c, U"foobar") == 0);
free(c); free(c);
c = c32dup(U""); c = xc32dup(U"");
xassert(c32cmp(c, U"") == 0); xassert(c32cmp(c, U"") == 0);
free(c); free(c);
} }

2
config.c
View file

@ -3213,7 +3213,7 @@ config_load(struct config *conf, const char *conf_path,
ret = false; ret = false;
} else { } else {
conf->fonts[0].count = 1; conf->fonts[0].count = 1;
conf->fonts[0].arr = malloc(sizeof(font)); conf->fonts[0].arr = xmalloc(sizeof(font));
conf->fonts[0].arr[0] = font; conf->fonts[0].arr[0] = font;
} }
} }

2
render.c
View file

@ -1460,7 +1460,7 @@ render_ime_preedit_for_seat(struct terminal *term, struct seat *seat,
* from grid), and mark all cells as dirty. This ensures they are * from grid), and mark all cells as dirty. This ensures they are
* re-rendered when the pre-edit text is modified or removed. * re-rendered when the pre-edit text is modified or removed.
*/ */
struct cell *real_cells = malloc(cells_used * sizeof(real_cells[0])); struct cell *real_cells = xmalloc(cells_used * sizeof(real_cells[0]));
for (int i = 0; i < cells_used; i++) { for (int i = 0; i < cells_used; i++) {
xassert(col_idx + i < term->cols); xassert(col_idx + i < term->cols);
real_cells[i] = row->cells[col_idx + i]; real_cells[i] = row->cells[col_idx + i];

2
server.c
View file

@ -301,7 +301,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
#undef CHECK_BUF_AND_NULL #undef CHECK_BUF_AND_NULL
#undef CHECK_BUF #undef CHECK_BUF
struct terminal_instance *instance = malloc(sizeof(struct terminal_instance)); struct terminal_instance *instance = xmalloc(sizeof(struct terminal_instance));
const bool need_to_clone_conf = const bool need_to_clone_conf =
tll_length(overrides)> 0 || tll_length(overrides)> 0 ||

2
shm.c
View file

@ -489,7 +489,7 @@ get_new_buffers(struct buffer_chain *chain, size_t count,
else else
tll_push_front(chain->bufs, buf); tll_push_front(chain->bufs, buf);
buf->public.dirty = malloc( buf->public.dirty = xmalloc(
chain->pix_instances * sizeof(buf->public.dirty[0])); chain->pix_instances * sizeof(buf->public.dirty[0]));
for (size_t j = 0; j < chain->pix_instances; j++) for (size_t j = 0; j < chain->pix_instances; j++)

2
spawn.c
View file

@ -145,7 +145,7 @@ spawn_expand_template(const struct config_spawn_template *template,
expanded[len] = '\0'; \ expanded[len] = '\0'; \
} while (0) } while (0)
*argv = malloc((*argc + 1) * sizeof((*argv)[0])); *argv = xmalloc((*argc + 1) * sizeof((*argv)[0]));
/* Expand the provided keys */ /* Expand the provided keys */
for (size_t i = 0; i < *argc; i++) { for (size_t i = 0; i < *argc; i++) {