miegl/mud
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid memcpy(X,NULL,0) UB

Browse Source
This commit is contained in:
angt
2016-02-29 15:35:04 +00:00
parent c5dc443986
commit a1ce4740b4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mud.c
View File

@@ -350,6 +350,9 @@ int mud_peer (struct mud *mud, const char *host, const char *port)
struct sock *sock; struct sock *sock;
struct sockaddr_storage addr; struct sockaddr_storage addr;
if (!p->ai_addr)
continue;
memcpy(&addr, p->ai_addr, p->ai_addrlen); memcpy(&addr, p->ai_addr, p->ai_addrlen);
for (sock = mud->sock; sock; sock = sock->next) for (sock = mud->sock; sock; sock = sock->next)
@@ -518,7 +521,9 @@ int mud_encrypt (struct mud *mud, uint64_t nonce,
mud_write48(npub, nonce); mud_write48(npub, nonce);
memcpy(dst, npub, 6); memcpy(dst, npub, 6);
memcpy(dst+6, src, ad_size);
if (src)
memcpy(dst+6, src, ad_size);
crypto_aead_aes256gcm_encrypt_afternm( crypto_aead_aes256gcm_encrypt_afternm(
dst+ad_size+6, NULL, dst+ad_size+6, NULL,
@@ -693,7 +698,7 @@ int mud_pull (struct mud *mud)
} }
if (!path->pong_time || if (!path->pong_time ||
(now-path->pong_time > UINT64_C(100000))) { (now-path->pong_time > UINT64_C(100000))) {
unsigned char tmp[256]; unsigned char tmp[256];
unsigned char pong[6*3]; unsigned char pong[6*3];