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

Fix spurious compiler warning in do_getpass().

Browse Source 
Some compilers apparently noticed that p2len was allowed to be equal
to msg, and so maybe we would be doing memset(prompt2, ' ', 0), and
decided that we probably meant to do memset(prompt2, 0, 0x20);
instead.

Stupid compilers, doing optimization before this kind of warning!

My fix is to just fill the entire prompt2 buffer with spaces,
because it's harmless.

Bugfix on e59f0d4cb9, not in any released Tor.
This commit is contained in:
Nick Mathewson 2016-10-11 09:34:08 -04:00
parent ab78a4df93
commit 7026b607a0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/routerkeys.c
View File

@ -49,7 +49,7 @@ do_getpass(const char *prompt, char *buf, size_t buflen,
if (p2len < sizeof(msg)) if (p2len < sizeof(msg))
p2len = sizeof(msg); p2len = sizeof(msg);
prompt2 = tor_malloc(p2len); prompt2 = tor_malloc(p2len);
memset(prompt2, ' ', p2len - sizeof(msg)); memset(prompt2, ' ', p2len);
memcpy(prompt2 + p2len - sizeof(msg), msg, sizeof(msg)); memcpy(prompt2 + p2len - sizeof(msg), msg, sizeof(msg));
buf2 = tor_malloc_zero(buflen); buf2 = tor_malloc_zero(buflen);