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

shared: add assertions to _parse_legacy_addr4() and _nm_utils_ascii_str_to_int64()

Browse source 
Add more assertion for hunting down assertion failure at [1].

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1797915
This commit is contained in:
Thomas Haller 2020-03-31 13:38:09 +02:00
parent 7ab561eb38
commit 87b0d4cd7c
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
shared/nm-glib-aux/nm-shared-utils.c
View file

@ -748,12 +748,17 @@ _parse_legacy_addr4 (const char *text, in_addr_t *out_addr, GError **error)
v = _nm_utils_ascii_str_to_int64 (current_token, 0, 0, 0xFF, -1);
if (v == -1) {
int errsv = errno;
/* we do accept octal and hex (even with leading "0x"). But something
* about this token is wrong. */
g_set_error (error,
NM_UTILS_ERROR,
NM_UTILS_ERROR_INVALID_ARGUMENT,
"invalid token '%s'", current_token);
"invalid token '%s': %s (%d)",
current_token,
nm_strerror_native (errsv),
errsv);
return FALSE;
}
@ -979,8 +984,24 @@ _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 ma
errno = 0;
v = g_ascii_strtoll (str, (char **) &s, base);
if (errno != 0)
if (errno != 0) {
#if NM_MORE_ASSERTS
int errsv = errno;
/* the caller must not pass an invalid @base. Hence, we expect the only failure that
* can happen here is ERANGE, because invalid @str is not signaled via an errno according
* to documentation. */
if ( errsv != ERANGE
|| !NM_IN_SET (v, G_MININT64, G_MAXINT64)) {
g_error ("g_ascii_strtoll() for \"%s\" failed with errno=%d (%s) and v=%"G_GINT64_FORMAT,
str,
errsv,
nm_strerror_native (errsv),
v);
}
#endif
return fallback;
}
if (s[0] != '\0') {
s = nm_str_skip_leading_spaces (s);