[PATCH weston] ivi-shell-transition: check create_layout_transition() return value.

Carlos Olmedo Escobar carlos.olmedo.e at gmail.com
Sat Jan 17 10:43:02 PST 2015


Signed-off-by: Carlos Olmedo Escobar <carlos.olmedo.e at gmail.com>
---
 ivi-shell/ivi-layout-transition.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ivi-shell/ivi-layout-transition.c b/ivi-shell/ivi-layout-transition.c
index 1e9ee23..904e8d6 100644
--- a/ivi-shell/ivi-layout-transition.c
+++ b/ivi-shell/ivi-layout-transition.c
@@ -328,8 +328,10 @@ create_move_resize_view_transition(
 			uint32_t duration)
 {
 	struct ivi_layout_transition *transition = create_layout_transition();
-	struct move_resize_view_data *data = malloc(sizeof(*data));
+	if (transition == NULL)
+		return NULL;
 
+	struct move_resize_view_data *data = malloc(sizeof(*data));
 	if (data == NULL) {
 		weston_log("%s: memory allocation fails\n", __func__);
 		return NULL;
@@ -451,8 +453,10 @@ create_fade_view_transition(
 			uint32_t duration)
 {
 	struct ivi_layout_transition *transition = create_layout_transition();
-	struct fade_view_data *data = malloc(sizeof(*data));
+	if (transition == NULL)
+		return NULL;
 
+	struct fade_view_data *data = malloc(sizeof(*data));
 	if (data == NULL) {
 		weston_log("%s: memory allocation fails\n", __func__);
 		return NULL;
@@ -675,8 +679,10 @@ create_move_layer_transition(
 		uint32_t duration)
 {
 	struct ivi_layout_transition *transition = create_layout_transition();
-	struct move_layer_data *data = malloc(sizeof(*data));
+	if (transition == NULL)
+		return NULL;
 
+	struct move_layer_data *data = malloc(sizeof(*data));
 	if (data == NULL) {
 		weston_log("%s: memory allocation fails\n", __func__);
 		return NULL;
@@ -819,8 +825,10 @@ ivi_layout_transition_fade_layer(
 	}
 
 	transition = create_layout_transition();
-	data = malloc(sizeof(*data));
+	if (transition == NULL)
+		return;
 
+	data = malloc(sizeof(*data));
 	if (data == NULL) {
 		weston_log("%s: memory allocation fails\n", __func__);
 		return;
-- 
2.1.4



More information about the wayland-devel mailing list