fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-06 06:48:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

animation: don't NULL deref if _run() returns NULL

Browse source 
Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
This commit is contained in:
U. Artie Eoff 2014-01-17 15:08:51 -08:00 • committed by Kristian Høgsberg
parent 6d71c3c05a
commit a62e0e0e02
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/animation.c
View file

@ -262,6 +262,9 @@ weston_zoom_run(struct weston_view *view, float start, float stop,
zoom_frame, reset_alpha,
done, data, NULL);
if (zoom == NULL)
return NULL;
weston_spring_init(&zoom->spring, 300.0, start, stop);
zoom->spring.friction = 1400;
zoom->spring.previous = start - (stop - start) * 0.03;
@ -291,6 +294,9 @@ weston_fade_run(struct weston_view *view,
fade_frame, reset_alpha,
done, data, NULL);
if (fade == NULL)
return NULL;
weston_spring_init(&fade->spring, k, start, end);
fade->spring.friction = 1400;
@ -337,6 +343,8 @@ weston_stable_fade_run(struct weston_view *front_view, float start,
stable_fade_frame, NULL,
done, data, back_view);
if (fade == NULL)
return NULL;
weston_spring_init(&fade->spring, 400, start, end);
fade->spring.friction = 1150;
@ -434,6 +442,10 @@ weston_move_scale_run(struct weston_view *view, int dx, int dy,
animation = weston_view_animation_run(view, start, end, move_frame,
NULL, move_done, data, move);
if (animation == NULL)
return NULL;
animation->spring.k = 400;
animation->spring.friction = 1150;