Merge pull request #701 from argilo/fix-8ic-multiply-conjugate

Avoid integer overflow in volk_8ic_x2_multiply_conjugate_16ic corner case
gnuradio · Dec 1, 2023 · 76c421e · 76c421e
2 parents 10971d6 + 2c4a9b4
commit 76c421e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/kernels/volk/volk_8ic_x2_multiply_conjugate_16ic.h b/kernels/volk/volk_8ic_x2_multiply_conjugate_16ic.h
@@ -11,6 +11,7 @@
 #define INCLUDED_volk_8ic_x2_multiply_conjugate_16ic_a_H
 
 #include <inttypes.h>
+#include <limits.h>
 #include <stdio.h>
 #include <volk/volk_complex.h>
 
@@ -81,7 +82,7 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_a_avx2(lv_16sc_t* cVector
         lv_32fc_t bVal = lv_cmake(bReal, -bImag);
         lv_32fc_t temp = aVal * bVal;
 
-        *c16Ptr++ = (int16_t)lv_creal(temp);
+        *c16Ptr++ = (int16_t)(lv_creal(temp) > SHRT_MAX ? SHRT_MAX : lv_creal(temp));
         *c16Ptr++ = (int16_t)lv_cimag(temp);
     }
 }
@@ -152,7 +153,7 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_a_sse4_1(lv_16sc_t* cVect
         lv_32fc_t bVal = lv_cmake(bReal, -bImag);
         lv_32fc_t temp = aVal * bVal;
 
-        *c16Ptr++ = (int16_t)lv_creal(temp);
+        *c16Ptr++ = (int16_t)(lv_creal(temp) > SHRT_MAX ? SHRT_MAX : lv_creal(temp));
         *c16Ptr++ = (int16_t)lv_cimag(temp);
     }
 }
@@ -185,7 +186,7 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_generic(lv_16sc_t* cVecto
         lv_32fc_t bVal = lv_cmake(bReal, -bImag);
         lv_32fc_t temp = aVal * bVal;
 
-        *c16Ptr++ = (int16_t)lv_creal(temp);
+        *c16Ptr++ = (int16_t)(lv_creal(temp) > SHRT_MAX ? SHRT_MAX : lv_creal(temp));
         *c16Ptr++ = (int16_t)lv_cimag(temp);
     }
 }
@@ -267,7 +268,7 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_u_avx2(lv_16sc_t* cVector
         lv_32fc_t bVal = lv_cmake(bReal, -bImag);
         lv_32fc_t temp = aVal * bVal;
 
-        *c16Ptr++ = (int16_t)lv_creal(temp);
+        *c16Ptr++ = (int16_t)(lv_creal(temp) > SHRT_MAX ? SHRT_MAX : lv_creal(temp));
         *c16Ptr++ = (int16_t)lv_cimag(temp);
     }
 }