diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2020-04-06 19:00:39 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2020-04-06 19:00:39 +0000 |
| commit | cf76724f3e495caa413694b3aa699458140b6b81 (patch) | |
| tree | d9446d85d037cd2e8e9a7de11b2bc0d3f7d2a19e /json-glib/json-gvariant.c | |
| parent | b4ede88a44fa75f258490fd017c5958ec11cf268 (diff) | |
| parent | 212f925a025f2beaf60040b416097833faa74446 (diff) | |
| download | json-glib-cf76724f3e495caa413694b3aa699458140b6b81.tar.gz | |
Merge branch 'gvariant-errno' into 'master'
json-gvariant: Stop string to GVariant conversion failing due to unrelated errno changes
See merge request GNOME/json-glib!22
Diffstat (limited to 'json-glib/json-gvariant.c')
| -rw-r--r-- | json-glib/json-gvariant.c | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/json-glib/json-gvariant.c b/json-glib/json-gvariant.c index 8185cac..a86507a 100644 --- a/json-glib/json-gvariant.c +++ b/json-glib/json-gvariant.c @@ -840,6 +840,9 @@ gvariant_simple_from_string (const gchar *st, { GVariant *variant = NULL; gchar *nptr = NULL; + gboolean conversion_error = FALSE; + gint64 signed_value; + guint64 unsigned_value; errno = 0; @@ -851,39 +854,55 @@ gvariant_simple_from_string (const gchar *st, else if (g_strcmp0 (st, "false") == 0) variant = g_variant_new_boolean (FALSE); else - errno = 1; + conversion_error = TRUE; break; case G_VARIANT_CLASS_BYTE: - variant = g_variant_new_byte (g_ascii_strtoll (st, &nptr, 10)); + signed_value = g_ascii_strtoll (st, &nptr, 10); + conversion_error = errno != 0 || nptr == st; + variant = g_variant_new_byte (signed_value); break; case G_VARIANT_CLASS_INT16: - variant = g_variant_new_int16 (g_ascii_strtoll (st, &nptr, 10)); + signed_value = g_ascii_strtoll (st, &nptr, 10); + conversion_error = errno != 0 || nptr == st; + variant = g_variant_new_int16 (signed_value); break; case G_VARIANT_CLASS_UINT16: + signed_value = g_ascii_strtoll (st, &nptr, 10); + conversion_error = errno != 0 || nptr == st; variant = g_variant_new_uint16 (g_ascii_strtoll (st, &nptr, 10)); break; case G_VARIANT_CLASS_INT32: + signed_value = g_ascii_strtoll (st, &nptr, 10); + conversion_error = errno != 0 || nptr == st; variant = g_variant_new_int32 (g_ascii_strtoll (st, &nptr, 10)); break; case G_VARIANT_CLASS_UINT32: - variant = g_variant_new_uint32 (g_ascii_strtoull (st, &nptr, 10)); + unsigned_value = g_ascii_strtoll (st, &nptr, 10); + conversion_error = errno != 0 || nptr == st; + variant = g_variant_new_uint32 (unsigned_value); break; case G_VARIANT_CLASS_INT64: + signed_value = g_ascii_strtoll (st, &nptr, 10); + conversion_error = errno != 0 || nptr == st; variant = g_variant_new_int64 (g_ascii_strtoll (st, &nptr, 10)); break; case G_VARIANT_CLASS_UINT64: - variant = g_variant_new_uint64 (g_ascii_strtoull (st, &nptr, 10)); + unsigned_value = g_ascii_strtoll (st, &nptr, 10); + conversion_error = errno != 0 || nptr == st; + variant = g_variant_new_uint64 (unsigned_value); break; case G_VARIANT_CLASS_HANDLE: - variant = g_variant_new_handle (strtol (st, &nptr, 10)); + signed_value = strtol (st, &nptr, 10); + conversion_error = errno != 0 || nptr == st; + variant = g_variant_new_handle (signed_value); break; case G_VARIANT_CLASS_DOUBLE: @@ -901,7 +920,7 @@ gvariant_simple_from_string (const gchar *st, break; } - if (errno != 0 || nptr == st) + if (conversion_error) { g_set_error_literal (error, G_IO_ERROR, |