Commit 534a0ba5 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.2.6' into maint-0.2.7

parents 8335b1f9 e2efa9e3

src/common/crypto.c

+3 −1
Original line number Diff line number Diff line
@@ -2574,9 +2574,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);