[beignet] 01/03: Fix crash on unsupported hardware (upstream 88957)

[Rebecca Palmer]

This is an automated email from the git hooks/post-receive script.

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit c60eb28e4695c1a30e042964a22b6e6536d14b92
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Thu Feb 26 14:41:11 2015 +0000

    Fix crash on unsupported hardware (upstream 88957)
---
 debian/changelog                     |  6 ++++++
 debian/patches/fixcrash-24b2ad.patch | 33 +++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 52918e8..d5af6de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+beignet (1.0.1-3) UNRELEASED; urgency=medium
+
+  * Fix crash on unsupported hardware.
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Thu, 26 Feb 2015 14:39:00 +0000
+
 beignet (1.0.1-2) experimental; urgency=medium
 
   * Force LLVM 3.5 to fix FTBFS in Ubuntu.
diff --git a/debian/patches/fixcrash-24b2ad.patch b/debian/patches/fixcrash-24b2ad.patch
new file mode 100644
index 0000000..ebd3fc7
--- /dev/null
+++ b/debian/patches/fixcrash-24b2ad.patch
@@ -0,0 +1,33 @@
+Description: fix crash on unsupported hardware
+
+Origin: upstream 24b2adbd958884d5874dc12f456cee9889583967
+Author: Zhigang Gong <zhigang.gong at intel.com>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88957
+diff --git a/src/cl_device_id.c b/src/cl_device_id.c
+index 3032a38..0fd4a69 100644
+--- a/src/cl_device_id.c
++++ b/src/cl_device_id.c
+@@ -395,13 +395,14 @@ brw_gt3_break:
+       printf("cl_get_gt_device(): error, unknown device: %x\n", device_id);
+   }
+ 
++  if (ret == NULL)
++    return NULL;
++
+   if (!CompilerSupported()) {
+-    if (ret != NULL) {
+-      ret->compiler_available = CL_FALSE;
+-      //ret->linker_available = CL_FALSE;
+-      ret->profile = "EMBEDDED_PROFILE";
+-      ret->profile_sz = strlen(ret->profile) + 1;
+-    }
++    ret->compiler_available = CL_FALSE;
++    //ret->linker_available = CL_FALSE;
++    ret->profile = "EMBEDDED_PROFILE";
++    ret->profile_sz = strlen(ret->profile) + 1;
+   }
+ 
+ #ifdef HAS_USERPTR
+-- 
+cgit v0.10.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 46a7d6c..e34ec29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fail-gracefully-cl_mem_allocate.patch
 llvm-search-order.patch
 remove-unsafe-define-D__-USER-__.patch
 force-llvm-3.5.patch
+fixcrash-24b2ad.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git