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

clients: Simplify memory allocation with xzalloc()

Browse Source 
It is redundant to check x*alloc's return value for null pointers, since
they are guaranteed to either return non-NULL or terminate the program.

In cases where we memset the malloc'd memory to 0, we can more
efficiently use the xzalloc() routine.  zalloc looks for opportunities
to return memory chunks that have already been zero'd out, so it can
provide better performance.

This patch addresses this warning, reported by Denis Denisov:

  [clients/window.c:1164] -> [clients/window.c:1166]: (warning) Possible
  null pointer dereference: surface - otherwise it is redundant to check
  it against null.

  [clients/window.c:4513] -> [clients/window.c:4514]: (warning) Possible
  null pointer dereference: surface - otherwise it is redundant to check
  it against null.

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
This commit is contained in:
Bryce Harrington 2015-06-19 16:12:22 -07:00
parent 430aee1c23
commit da9d8fa3e4
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clients/window.c
View File

@ -1162,12 +1162,7 @@ shm_surface_create(struct display *display, struct wl_surface *wl_surface,
struct shm_surface *surface;
DBG_OBJ(wl_surface, "\n");
surface = xmalloc(sizeof *surface);
memset(surface, 0, sizeof *surface);
if (!surface)
return NULL;
surface = xzalloc(sizeof *surface);
surface->base.prepare = shm_surface_prepare;
surface->base.swap = shm_surface_swap;
surface->base.acquire = shm_surface_acquire;
@ -4511,11 +4506,7 @@ surface_create(struct window *window)
struct display *display = window->display;
struct surface *surface;
surface = xmalloc(sizeof *surface);
memset(surface, 0, sizeof *surface);
if (!surface)
return NULL;
surface = xzalloc(sizeof *surface);
surface->window = window;
surface->surface = wl_compositor_create_surface(display->compositor);
surface->buffer_scale = 1;