Allocate buffer first before getting the buffer info.

stride, bpp information is available after allocating buffer.

Change-Id: I0b061f8e99671399850fc7653ec4bea6b96b06e5

diff --git a/packaging/liblivebox-edje.spec b/packaging/liblivebox-edje.spec
index 49eb617..6bd9331 100644 (file)
--- a/packaging/liblivebox-edje.spec
+++ b/packaging/liblivebox-edje.spec
@@ -1,6 +1,6 @@
 Name: liblivebox-edje
 Summary: EDJE Script loader for the data provider master
-Version: 0.7.3
+Version: 0.7.4
 Release: 1
 Group: HomeTF/Livebox
 License: Flora

diff --git a/src/script_port.c b/src/script_port.c
index 4b4453f..979f41d 100644 (file)
--- a/src/script_port.c
+++ b/src/script_port.c
@@ -1698,10 +1698,16 @@ static void *alloc_fb(void *data, int size)
 
 static void *alloc_with_stride_fb(void *data, int size, int *stride, int *bpp)
 {
+       void *canvas;
        struct info *handle = data;
        int _stride;
        int _bpp;
 
+       canvas = alloc_fb(data, size);
+       if (!canvas) {
+               ErrPrint("Unable to allocate canvas buffer\n");
+       }
+
        _bpp = script_buffer_pixels(handle->buffer_handle);
        if (_bpp < 0) {
                ErrPrint("Failed to get pixel size, fallback to 4\n");
@@ -1721,7 +1727,7 @@ static void *alloc_with_stride_fb(void *data, int size, int *stride, int *bpp)
        *stride = _stride;
        *bpp = _bpp << 3;
 
-       return alloc_fb(data, size);
+       return canvas;
 }
 
 static void free_fb(void *data, void *ptr)