Mesa (master): vl: u_upload_alloc might fail to allocate buffer in bicubic filter

[Marek Olšák]

Module: Mesa
Branch: master
Commit: b8861911c5c1556d27d5e9bcabfd667c894222d8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b8861911c5c1556d27d5e9bcabfd667c894222d8

Author: Nayan Deshmukh <nayan26deshmukh at gmail.com>
Date:   Wed Feb 22 14:13:02 2017 +0530

vl: u_upload_alloc might fail to allocate buffer in bicubic filter

Signed-off-by: Nayan Deshmukh <nayan26deshmukh at gmail.com>
Signed-off-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/auxiliary/vl/vl_bicubic_filter.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/vl/vl_bicubic_filter.c b/src/gallium/auxiliary/vl/vl_bicubic_filter.c
index ae29208..efd8a1c 100644
--- a/src/gallium/auxiliary/vl/vl_bicubic_filter.c
+++ b/src/gallium/auxiliary/vl/vl_bicubic_filter.c
@@ -421,14 +421,16 @@ vl_bicubic_filter_render(struct vl_bicubic_filter *filter,
    viewport.scale[2] = 1;
 
    struct pipe_constant_buffer cb = {};
-   float *ptr;
+   float *ptr = NULL;
 
    u_upload_alloc(filter->pipe->const_uploader, 0, 2 * sizeof(float), 256,
                   &cb.buffer_offset, &cb.buffer, (void**)&ptr);
    cb.buffer_size = 2 * sizeof(float);
 
-   ptr[0] = 0.5f/viewport.scale[0];
-   ptr[1] = 0.5f/viewport.scale[1];
+   if (ptr) {
+      ptr[0] = 0.5f/viewport.scale[0];
+      ptr[1] = 0.5f/viewport.scale[1];
+   }
    u_upload_unmap(filter->pipe->const_uploader);
 
    memset(&fb_state, 0, sizeof(fb_state));