commit d9fc9845afd6ad07f6c46993b1ca8a616a1e5a3f
author Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Oct 13 12:58:25 2014 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Oct 17 16:36:24 2014 -0600
tree 912c1f5739204d96a7c50e1c832a00bf27bc255c
parent 191b06c2da62ae580de8ab5027b354b3065549d5

intel: Only check string if length > 0

strncmp will return 0 (match) when given two different strings
and a length of 0. Changed code to only do the compare if
length > 0. Now properly handles empty environment variable or
one that has multiple commas in a row.

icd/intel/intel.c

diff --git a/icd/intel/intel.c b/icd/intel/intel.c
index 106f1eb..6cd0fa0 100644
--- a/icd/intel/intel.c
+++ b/icd/intel/intel.c
@@ -53,13 +53,15 @@
         else
             len = strlen(env);
 
-        if (strncmp(env, "batch", len) == 0) {
-            intel_debug |= INTEL_DEBUG_BATCH;
-        } else if (strncmp(env, "nohw", len) == 0) {
-            intel_debug |= INTEL_DEBUG_NOHW;
-        } else if (strncmp(env, "0x", 2) == 0) {
-            intel_debug |= INTEL_DEBUG_NOHW;
-            intel_devid_override = strtol(env, NULL, 16);
+        if (len > 0) {
+            if (strncmp(env, "batch", len) == 0) {
+                intel_debug |= INTEL_DEBUG_BATCH;
+            } else if (strncmp(env, "nohw", len) == 0) {
+                intel_debug |= INTEL_DEBUG_NOHW;
+            } else if (strncmp(env, "0x", 2) == 0) {
+                intel_debug |= INTEL_DEBUG_NOHW;
+                intel_devid_override = strtol(env, NULL, 16);
+            }
         }
 
         if (!p)