mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clients: Use xmalloc in a few more places

Browse Source 
Just changes some places where a malloc failure is unhandled
to our xmalloc function that exit()s a little more gracefully.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <b.harrington@samsung.com>
This commit is contained in:
Derek Foreman 2014-11-20 15:42:35 -06:00 committed by Pekka Paalanen
parent 2cd82b7692
commit 2204492636
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/editor.c
View File

@ -682,7 +682,7 @@ text_entry_update_layout(struct text_entry *entry)
(entry->preedit.text ? strlen(entry->preedit.text) : 0))); (entry->preedit.text ? strlen(entry->preedit.text) : 0)));
if (entry->preedit.text) { if (entry->preedit.text) {
text = malloc(strlen(entry->text) + strlen(entry->preedit.text) + 1); text = xmalloc(strlen(entry->text) + strlen(entry->preedit.text) + 1);
strncpy(text, entry->text, entry->cursor); strncpy(text, entry->text, entry->cursor);
strcpy(text + entry->cursor, entry->preedit.text); strcpy(text + entry->cursor, entry->preedit.text);
strcpy(text + entry->cursor + strlen(entry->preedit.text), strcpy(text + entry->cursor + strlen(entry->preedit.text),
@ -764,7 +764,7 @@ static void
text_entry_insert_at_cursor(struct text_entry *entry, const char *text, text_entry_insert_at_cursor(struct text_entry *entry, const char *text,
int32_t cursor, int32_t anchor) int32_t cursor, int32_t anchor)
{ {
char *new_text = malloc(strlen(entry->text) + strlen(text) + 1); char *new_text = xmalloc(strlen(entry->text) + strlen(text) + 1);
strncpy(new_text, entry->text, entry->cursor); strncpy(new_text, entry->text, entry->cursor);
strcpy(new_text + entry->cursor, text); strcpy(new_text + entry->cursor, text);

2
clients/window.c
View File

@ -5391,7 +5391,7 @@ init_dummy_surface(struct display *display)
void *data; void *data;
len = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, 1); len = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, 1);
data = malloc(len); data = xmalloc(len);
display->dummy_surface = display->dummy_surface =
cairo_image_surface_create_for_data(data, CAIRO_FORMAT_ARGB32, cairo_image_surface_create_for_data(data, CAIRO_FORMAT_ARGB32,
1, 1, len); 1, 1, len);