From: Nayan Deshmukh <nayan26deshmukh@gmail.com>
Date: Wed, 22 Feb 2017 08:25:02 +0000 (+0530)
Subject: vl: u_upload_alloc might fail to allocate buffer in bicubic filter
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b8861911c5c1556d27d5e9bcabfd667c894222d8;p=mesa.git

vl: u_upload_alloc might fail to allocate buffer in bicubic filter

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

diff --git a/src/gallium/auxiliary/vl/vl_bicubic_filter.c b/src/gallium/auxiliary/vl/vl_bicubic_filter.c
index ae292084283..efd8a1c7aec 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));