nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3' into maint-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2018-10-15 10:48:35 -04:00
commit 3462f8ed64
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/util_bug.h
View File

@ -102,7 +102,12 @@
} STMT_END } STMT_END
#endif /* defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) */ #endif /* defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) */
#define tor_assert_unreached() tor_assert(0) #define tor_assert_unreached() \
STMT_BEGIN { \
tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, \
"line should be unreached"); \
abort(); \
} STMT_END
/* Non-fatal bug assertions. The "unreached" variants mean "this line should /* Non-fatal bug assertions. The "unreached" variants mean "this line should
* never be reached." The "once" variants mean "Don't log a warning more than * never be reached." The "once" variants mean "Don't log a warning more than

7
src/or/hs_common.c
View File

@ -524,7 +524,7 @@ rend_data_get_address(const rend_data_t *rend_data)
return TO_REND_DATA_V2(rend_data)->onion_address; return TO_REND_DATA_V2(rend_data)->onion_address;
default: default:
/* We should always have a supported version. */ /* We should always have a supported version. */
tor_assert(0); tor_assert_unreached();
} }
} }
@ -547,7 +547,7 @@ rend_data_get_desc_id(const rend_data_t *rend_data, uint8_t replica,
return TO_REND_DATA_V2(rend_data)->descriptor_id[replica]; return TO_REND_DATA_V2(rend_data)->descriptor_id[replica];
default: default:
/* We should always have a supported version. */ /* We should always have a supported version. */
tor_assert(0); tor_assert_unreached();
} }
} }
@ -570,7 +570,7 @@ rend_data_get_pk_digest(const rend_data_t *rend_data, size_t *len_out)
} }
default: default:
/* We should always have a supported version. */ /* We should always have a supported version. */
tor_assert(0); tor_assert_unreached();
} }
} }
@ -1817,4 +1817,3 @@ hs_inc_rdv_stream_counter(origin_circuit_t *circ)
tor_assert_nonfatal_unreached(); tor_assert_nonfatal_unreached();
} }
} }