Browse Source

Merge remote-tracking branch 'argonblue/bug22410'

Nick Mathewson 6 years ago
parent
commit
c2e546aa23
2 changed files with 22 additions and 0 deletions
  1. 4 0
      changes/bug22410
  2. 18 0
      configure.ac

+ 4 - 0
changes/bug22410

@@ -0,0 +1,4 @@
+  o Minor bugfixes (portability):
+    - Check at configure time whether uint8_t is unsigned char.  Lots
+      of existing code already assumes this, and there could be strict
+      aliasing issues if they aren't the same type.  Fixes #22410.

+ 18 - 0
configure.ac

@@ -1552,6 +1552,24 @@ if test "$tor_cv_sign_extend" != "no"; then
             [Define to 1 iff right-shifting a negative value performs sign-extension])
 fi
 
+# Is uint8_t the same type as unsigned char?
+AC_CACHE_CHECK([whether uint8_t is the same type as unsigned char], tor_cv_uint8_uchar,
+[AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+#include <stdint.h>
+extern uint8_t c;
+unsigned char c;]])],
+       [tor_cv_uint8_uchar=yes],
+       [tor_cv_uint8_uchar=no],
+       [tor_cv_uint8_uchar=cross])])
+
+if test "$tor_cv_uint8_uchar" = "cross"; then
+  AC_MSG_NOTICE([Cross-compiling: we'll assume that uint8_t is the same type as unsigned char])
+fi
+
+if test "$tor_cv_uint8_uchar" = "no"; then
+  AC_MSG_ERROR([We assume that uint8_t is the same type as unsigned char, but your compiler disagrees.])
+fi
+
 # Whether we should use the dmalloc memory allocation debugging library.
 AC_MSG_CHECKING(whether to use dmalloc (debug memory allocation library))
 AC_ARG_WITH(dmalloc,