Skip to content

examples: fix local socket address lengths #3601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Old-Ding wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −26
Open

examples: fix local socket address lengths #3601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions examples/udgram/udgram_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,10 @@ int main(int argc, FAR char *argv[])

/* Set up the server address */

addrlen = sizeof(CONFIG_EXAMPLES_UDGRAM_ADDR);
if (addrlen > UNIX_PATH_MAX)
{
addrlen = UNIX_PATH_MAX;
}
addrlen = strnlen(CONFIG_EXAMPLES_UDGRAM_ADDR, UNIX_PATH_MAX - 1);

server.sun_family = AF_LOCAL;
strlcpy(server.sun_path, CONFIG_EXAMPLES_UDGRAM_ADDR, addrlen);
strlcpy(server.sun_path, CONFIG_EXAMPLES_UDGRAM_ADDR, addrlen + 1);

@xiaoxiang781216 xiaoxiang781216 Jul 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why change? strlcpy could ensure '\0' is terminated at the end of server.sun_path


addrlen += sizeof(sa_family_t) + 1;

Expand Down
8 changes: 2 additions & 6 deletions examples/udgram/udgram_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,10 @@ int main(int argc, FAR char *argv[])

/* Bind the socket to a local address */

addrlen = sizeof(CONFIG_EXAMPLES_UDGRAM_ADDR);
if (addrlen > UNIX_PATH_MAX)
{
addrlen = UNIX_PATH_MAX;
}
addrlen = strnlen(CONFIG_EXAMPLES_UDGRAM_ADDR, UNIX_PATH_MAX - 1);

server.sun_family = AF_LOCAL;
strlcpy(server.sun_path, CONFIG_EXAMPLES_UDGRAM_ADDR, addrlen);
strlcpy(server.sun_path, CONFIG_EXAMPLES_UDGRAM_ADDR, addrlen + 1);

addrlen += sizeof(sa_family_t) + 1;

Expand Down
9 changes: 2 additions & 7 deletions examples/ustream/ustream_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,10 @@ int main(int argc, FAR char *argv[])

/* Connect the socket to the server */

addrlen = sizeof(CONFIG_EXAMPLES_USTREAM_ADDR);
if (addrlen > UNIX_PATH_MAX)
{
addrlen = UNIX_PATH_MAX;
}
addrlen = strnlen(CONFIG_EXAMPLES_USTREAM_ADDR, UNIX_PATH_MAX - 1);

myaddr.sun_family = AF_LOCAL;
strlcpy(myaddr.sun_path, CONFIG_EXAMPLES_USTREAM_ADDR, addrlen);
myaddr.sun_path[addrlen] = '\0';
strlcpy(myaddr.sun_path, CONFIG_EXAMPLES_USTREAM_ADDR, addrlen + 1);

printf("client: Connecting to %s...\n", CONFIG_EXAMPLES_USTREAM_ADDR);
addrlen += sizeof(sa_family_t) + 1;
Expand Down
9 changes: 2 additions & 7 deletions examples/ustream/ustream_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,10 @@ int main(int argc, char *argv[])

/* Bind the socket to a local address */

addrlen = sizeof(CONFIG_EXAMPLES_USTREAM_ADDR);
if (addrlen > UNIX_PATH_MAX)
{
addrlen = UNIX_PATH_MAX;
}
addrlen = strnlen(CONFIG_EXAMPLES_USTREAM_ADDR, UNIX_PATH_MAX - 1);

myaddr.sun_family = AF_LOCAL;
strlcpy(myaddr.sun_path, CONFIG_EXAMPLES_USTREAM_ADDR, addrlen);
myaddr.sun_path[addrlen] = '\0';
strlcpy(myaddr.sun_path, CONFIG_EXAMPLES_USTREAM_ADDR, addrlen + 1);

addrlen += sizeof(sa_family_t) + 1;
ret = bind(listensd, (struct sockaddr *)&myaddr, addrlen);
Expand Down