fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-19 08:00:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: ignore phrases in fixup device description only when delimited by space

Browse source 
(cherry picked from commit 72104ea10a)
This commit is contained in:
Thomas Haller 2017-05-19 11:01:23 +02:00
parent c22075dc98
commit aa60b77146
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libnm/nm-device.c
View file

@ -1507,7 +1507,11 @@ fixup_desc_string (const char *desc)
if (p) {
const char *eow = &p[strlen (IGNORED_PHRASES[i])];
memmove (p, eow, strlen (eow) + 1); /* +1 for the \0 */
/* require that the phrase is delimited by space, or
* at the beginning or end of the description. */
if ( (p == desc_full || p[-1] == ' ')
&& NM_IN_SET (eow[0], '\0', ' '))
memmove (p, eow, strlen (eow) + 1); /* +1 for the \0 */
}
}