summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--src/test/test_relaycell.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 85ba939a87..79457372f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1851,6 +1851,7 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then
-Wstatic-local-in-inline
-Wstrict-overflow=2
-Wstring-compare
+ -Wstring-conversion
-Wstrlcpy-strlcat-size
-Wstrncat-size
-Wsuggest-attribute=format
diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c
index 1cd9ff064b..fb6748965a 100644
--- a/src/test/test_relaycell.c
+++ b/src/test/test_relaycell.c
@@ -95,7 +95,7 @@ test_relaycell_resolved(void *arg)
tt_int_op(srm_ncalls, OP_EQ, 1); \
tt_ptr_op(srm_conn, OP_EQ, entryconn); \
tt_int_op(srm_atype, OP_EQ, (atype)); \
- if (answer) { \
+ if ((answer) != NULL) { \
tt_int_op(srm_alen, OP_EQ, sizeof(answer)-1); \
tt_int_op(srm_alen, OP_LT, 512); \
tt_int_op(srm_answer_is_set, OP_EQ, 1); \