fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-20 03:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nm-udev-utils: constify strstr-output variable

Browse source 
`subsystem_full` is const, so `s` needs to be const too.
Reorder the NULL-byte write so that we are not writing
into a const char* (the underlying memory is the same).
This commit is contained in:
Jan Vaclav 2025-12-02 14:50:34 +01:00
parent 487ca30256
commit 5f6beb0e57
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libnm-udev-aux/nm-udev-utils.c
View file

@ -92,7 +92,8 @@ _subsystem_split(const char *subsystem_full,
const char **out_devtype, const char **out_devtype,
char **to_free) char **to_free)
{ {
char *tmp, *s; char *tmp;
const char *s;
nm_assert(subsystem_full); nm_assert(subsystem_full);
nm_assert(out_subsystem); nm_assert(out_subsystem);
@ -101,12 +102,12 @@ _subsystem_split(const char *subsystem_full,
s = strstr(subsystem_full, "/"); s = strstr(subsystem_full, "/");
if (s) { if (s) {
tmp = g_strdup(subsystem_full); tmp = g_strdup(subsystem_full);
s = &tmp[s - subsystem_full]; tmp[s - subsystem_full] = '\0';
*s = '\0'; s = &tmp[s - subsystem_full];
*out_subsystem = tmp; *out_subsystem = tmp;
*out_devtype = &s[1]; *out_devtype = &s[1];
*to_free = tmp; *to_free = tmp;
} else { } else {
*out_subsystem = subsystem_full; *out_subsystem = subsystem_full;
*out_devtype = NULL; *out_devtype = NULL;