Skip to content

Commit 6214af7

Browse files
authored
Merge pull request #88 from TERESH1/recvfrom_unix_dgram_socket-null-after-deref
Fix dereference before NULL in recvfrom_unix_dgram_socket
2 parents 16ff01b + 8059822 commit 6214af7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

C/unix/libunixsocket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,14 +448,14 @@ ssize_t recvfrom_unix_dgram_socket(int sfd, void* buf, size_t size, char* from,
448448
struct sockaddr_un saddr;
449449

450450
memset(buf, 0, size);
451-
memset(from, 0, from_size);
452451

453452
if (-1 ==
454453
check_error(bytes = recvfrom(sfd, buf, size, recvfrom_flags,
455454
(struct sockaddr*)&saddr, &socksize)))
456455
return -1;
457456

458457
if (from != NULL && from_size > 0) {
458+
memset(from, 0, from_size);
459459
memcpy(from, saddr.sun_path,
460460
from_size < sizeof(saddr.sun_path) ? from_size
461461
: sizeof(saddr.sun_path));

0 commit comments

Comments
 (0)