avx2, two-table: don't segfault for NaN input

In the AVX2 and two-table linear-float => gamma-int8 conversions,
tweak the input bounds-check to handle NaN values.  NaN would
previously lead to an out-of-bounds table lookup, and a segfault
(see issue #43).

diff --git a/extensions/avx2-int8.c b/extensions/avx2-int8.c
index 3eaf225f2a9391bac8d48796e7c6cb9d87cbdabc..b6d516566f6d005af223e0310c14389726db2302 100644 (file)
--- a/extensions/avx2-int8.c
+++ b/extensions/avx2-int8.c
@@ -41,31 +41,31 @@
                                                           \
       if (x < 0.0f)                                       \
         *dst = 0;                                         \
-      else if (x > 1.0f)                                  \
-        *dst = 255;                                       \
-      else                                                \
+      else if (x <= 1.0f)                                 \
         *dst = linear_to_gamma[(int) (SCALE * x + 0.5f)]; \
+      else /* x > 1.0f || isnan (x) */                    \
+        *dst = 255;                                       \
                                                           \
       src++;                                              \
       dst++;                                              \
     }                                                     \
   while (0)
 
-#define CVTA1(src, dst)           \
-  do                              \
-    {                             \
-      float x = *src;             \
-                                  \
-      if (x < 0.0f)               \
-        *dst = 0;                 \
-      else if (x > 1.0f)          \
-        *dst = 255;               \
-      else                        \
-        *dst = 255.0f * x + 0.5f; \
-                                  \
-      src++;                      \
-      dst++;                      \
-    }                             \
+#define CVTA1(src, dst)                                   \
+  do                                                      \
+    {                                                     \
+      float x = *src;                                     \
+                                                          \
+      if (x < 0.0f)                                       \
+        *dst = 0;                                         \
+      else if (x <= 1.0f)                                 \
+        *dst = 255.0f * x + 0.5f;                         \
+      else /* x > 1.0f || isnan (x) */                    \
+        *dst = 255;                                       \
+                                                          \
+      src++;                                              \
+      dst++;                                              \
+    }                                                     \
   while (0)
 
 static inline void

diff --git a/extensions/two-table.c b/extensions/two-table.c
index efdfa70cb74d9a8dc236c98d2aa5ce9992494622..8becfee70f85c0a2dd63bc4e23b274439ebe2114 100644 (file)
--- a/extensions/two-table.c
+++ b/extensions/two-table.c
@@ -25,21 +25,29 @@
 static inline unsigned char
 conv_float_u8_two_table_map (float value)
 {
-  unsigned short index;
-  unsigned char result;
   if (value < 0.0f)
-    return 0;
-  else if (value > 1.0f)
-    return 0xFF;
-  index = (unsigned short)(value * 0xFFFF);
-  result = linear_to_gamma[index];
-
-  if (value < u8_gamma_minimums[result])
-    result -= 1;
-  else if (value >= u8_gamma_minimums[result+1])
-    result += 1;
-
-  return result;
+    {
+      return 0;
+    }
+  else if (value <= 1.0f)
+    {
+      unsigned short index;
+      unsigned char  result;
+
+      index  = (unsigned short) (value * 0xFFFF);
+      result = linear_to_gamma[index];
+
+      if (value < u8_gamma_minimums[result])
+        result -= 1;
+      else if (value >= u8_gamma_minimums[result+1])
+        result += 1;
+
+      return result;
+    }
+  else /* value > 1.0f || isnan (value) */
+    {
+      return 0xFF;
+    }
 }
 
 static void