diff options
| author | Andreas Schwab <[email protected]> | 2008-12-01 20:14:43 +0000 |
|---|---|---|
| committer | Andreas Schwab <[email protected]> | 2008-12-01 20:14:43 +0000 |
| commit | c115043bf3719eb7ed98db71d833e3e211d5c709 (patch) | |
| tree | 5b3cf63622736a6b719822d322c6b8aeb16474ef | |
| parent | d78494f96281f4f27777b4920727aa7397a31613 (diff) | |
(register_font_driver): Use xmalloc.
(font_put_frame_data): Likewise.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/font.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f9e823aed0..7ae14388c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-12-01 Andreas Schwab <[email protected]> + + * font.c (register_font_driver): Use xmalloc. + (font_put_frame_data): Likewise. + 2008-12-01 Chong Yidong <[email protected]> * xfaces.c (realize_x_face): Make abort condition clearer. diff --git a/src/font.c b/src/font.c index a8753ba7d6..ccac5af3fd 100644 --- a/src/font.c +++ b/src/font.c @@ -3451,7 +3451,7 @@ register_font_driver (driver, f) if (EQ (list->driver->type, driver->type)) error ("Duplicated font driver: %s", SDATA (SYMBOL_NAME (driver->type))); - list = malloc (sizeof (struct font_driver_list)); + list = xmalloc (sizeof (struct font_driver_list)); list->on = 0; list->driver = driver; list->next = NULL; @@ -3577,9 +3577,7 @@ font_put_frame_data (f, driver, data) if (! list) { - list = malloc (sizeof (struct font_data_list)); - if (! list) - return -1; + list = xmalloc (sizeof (struct font_data_list)); list->driver = driver; list->next = f->font_data_list; f->font_data_list = list; |