diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-28 06:59:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-28 06:59:03 -0400 |
| commit | a8676b1edecee2d1d472b7f67dd026ef7b084a2f (patch) | |
| tree | d9ba30676becb8e03bbceaae9ba19a8288a2eb1d /src/test/test_buffers.c | |
| parent | f0488551e7be4e2d21a104903a86be993a240398 (diff) | |
| parent | 47573038736b96e2a353a25ed3c788dcb77d8fcb (diff) | |
| download | tor-a8676b1edecee2d1d472b7f67dd026ef7b084a2f.tar.gz tor-a8676b1edecee2d1d472b7f67dd026ef7b084a2f.zip | |
Merge branch 'bug18902_squashed'
Diffstat (limited to 'src/test/test_buffers.c')
| -rw-r--r-- | src/test/test_buffers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 20a1e34f97..4a6e94d9e9 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -178,10 +178,10 @@ test_buffers_basic(void *arg) /* Try adding a string too long for any freelist. */ { - char *cp = tor_malloc_zero(65536); + char *mem = tor_malloc_zero(65536); buf = buf_new(); - write_to_buf(cp, 65536, buf); - tor_free(cp); + write_to_buf(mem, 65536, buf); + tor_free(mem); tt_int_op(buf_datalen(buf), OP_EQ, 65536); buf_free(buf); |