diff options
| author | Andreas Schwab | 2008-12-01 20:14:43 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-12-01 20:14:43 +0000 |
| commit | c115043bf3719eb7ed98db71d833e3e211d5c709 (patch) | |
| tree | 5b3cf63622736a6b719822d322c6b8aeb16474ef | |
| parent | d78494f96281f4f27777b4920727aa7397a31613 (diff) | |
| download | emacs-c115043bf3719eb7ed98db71d833e3e211d5c709.tar.gz emacs-c115043bf3719eb7ed98db71d833e3e211d5c709.zip | |
(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 f9e823aed05..7ae14388c64 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-12-01 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * font.c (register_font_driver): Use xmalloc. | ||
| 4 | (font_put_frame_data): Likewise. | ||
| 5 | |||
| 1 | 2008-12-01 Chong Yidong <cyd@stupidchicken.com> | 6 | 2008-12-01 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * xfaces.c (realize_x_face): Make abort condition clearer. | 8 | * xfaces.c (realize_x_face): Make abort condition clearer. |
diff --git a/src/font.c b/src/font.c index a8753ba7d62..ccac5af3fd8 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -3451,7 +3451,7 @@ register_font_driver (driver, f) | |||
| 3451 | if (EQ (list->driver->type, driver->type)) | 3451 | if (EQ (list->driver->type, driver->type)) |
| 3452 | error ("Duplicated font driver: %s", SDATA (SYMBOL_NAME (driver->type))); | 3452 | error ("Duplicated font driver: %s", SDATA (SYMBOL_NAME (driver->type))); |
| 3453 | 3453 | ||
| 3454 | list = malloc (sizeof (struct font_driver_list)); | 3454 | list = xmalloc (sizeof (struct font_driver_list)); |
| 3455 | list->on = 0; | 3455 | list->on = 0; |
| 3456 | list->driver = driver; | 3456 | list->driver = driver; |
| 3457 | list->next = NULL; | 3457 | list->next = NULL; |
| @@ -3577,9 +3577,7 @@ font_put_frame_data (f, driver, data) | |||
| 3577 | 3577 | ||
| 3578 | if (! list) | 3578 | if (! list) |
| 3579 | { | 3579 | { |
| 3580 | list = malloc (sizeof (struct font_data_list)); | 3580 | list = xmalloc (sizeof (struct font_data_list)); |
| 3581 | if (! list) | ||
| 3582 | return -1; | ||
| 3583 | list->driver = driver; | 3581 | list->driver = driver; |
| 3584 | list->next = f->font_data_list; | 3582 | list->next = f->font_data_list; |
| 3585 | f->font_data_list = list; | 3583 | f->font_data_list = list; |