Commit f557a7f3 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.7'

parents 7b6d7aae 534a0ba5
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -2957,9 +2957,11 @@ smartlist_shuffle(smartlist_t *sl)
void
memwipe(void *mem, uint8_t byte, size_t sz)
{
  if (mem == NULL || sz == 0) {
  if (sz == 0) {
    return;
  }
  /* If sz is nonzero, then mem must not be NULL. */
  tor_assert(mem != NULL);

  /* Data this large is likely to be an underflow. */
  tor_assert(sz < SIZE_T_CEILING);