luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-31 16:32:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't interpret leading zeros as octal. The specification requires %f

Browse Source 
2005-01-20  Matthias Clasen  <mclasen@redhat.com>

	* glib/gkeyfile.c (g_key_file_parse_value_as_integer): Don't
	interpret leading zeros as octal. The specification requires
	%f parsing, and %f doesn't allow octal.

	* tests/keyfile-test.c: Add some more tests.
This commit is contained in:
Matthias Clasen
2005-01-20 17:17:32 +00:00
committed by Matthias Clasen
parent 90b06662b6
commit af5b0f8e5b
6 changed files with 82 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2005-01-20 Matthias Clasen <mclasen@redhat.com>
* glib/gkeyfile.c (g_key_file_parse_value_as_integer): Don't
interpret leading zeros as octal. The specification requires
%f parsing, and %f doesn't allow octal.
* tests/keyfile-test.c: Add some more tests.
* glib/gkeyfile.c (g_key_file_get_keys): Return keys in

4
ChangeLog.pre-2-10
View File

@@ -1,5 +1,9 @@
2005-01-20 Matthias Clasen <mclasen@redhat.com>
* glib/gkeyfile.c (g_key_file_parse_value_as_integer): Don't
interpret leading zeros as octal. The specification requires
%f parsing, and %f doesn't allow octal.
* tests/keyfile-test.c: Add some more tests.
* glib/gkeyfile.c (g_key_file_get_keys): Return keys in

4
ChangeLog.pre-2-12
View File

@@ -1,5 +1,9 @@
2005-01-20 Matthias Clasen <mclasen@redhat.com>
* glib/gkeyfile.c (g_key_file_parse_value_as_integer): Don't
interpret leading zeros as octal. The specification requires
%f parsing, and %f doesn't allow octal.
* tests/keyfile-test.c: Add some more tests.
* glib/gkeyfile.c (g_key_file_get_keys): Return keys in

4
ChangeLog.pre-2-8
View File

@@ -1,5 +1,9 @@
2005-01-20 Matthias Clasen <mclasen@redhat.com>
* glib/gkeyfile.c (g_key_file_parse_value_as_integer): Don't
interpret leading zeros as octal. The specification requires
%f parsing, and %f doesn't allow octal.
* tests/keyfile-test.c: Add some more tests.
* glib/gkeyfile.c (g_key_file_get_keys): Return keys in

2
glib/gkeyfile.c
View File

@@ -3163,7 +3163,7 @@ g_key_file_parse_value_as_integer (GKeyFile *key_file,
gchar *end_of_valid_int;
gint int_value = 0;
int_value = strtol (value, &end_of_valid_int, 0);
int_value = strtol (value, &end_of_valid_int, 10);
if (*end_of_valid_int != '\0')
g_set_error (error, G_KEY_FILE_ERROR,

66
tests/keyfile-test.c
View File

@@ -108,6 +108,27 @@ check_boolean_value (GKeyFile *keyfile,
}
}
static void
check_integer_value (GKeyFile *keyfile,
const gchar *group,
const gchar *key,
gint expected)
{
GError *error = NULL;
gint value;
value = g_key_file_get_integer (keyfile, group, key, &error);
check_no_error (&error);
if (value != expected)
{
g_print ("Group %s key %s: "
"expected integer value %d, actual value %d\n",
group, key, expected, value);
exit (1);
}
}
static void
check_name (const gchar *what,
const gchar *value,
@@ -343,7 +364,49 @@ test_boolean (void)
check_error (&error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE);
}
int
/* check parsing of integer values */
static void
test_integer (void)
{
GKeyFile *keyfile;
GError *error = NULL;
const gchar *data =
"[valid]\n"
"key1=0\n"
"key2=1\n"
"key3=-1\n"
"key4=2324431\n"
"key5=-2324431\n"
"key6=000111\n"
"[invalid]\n"
"key1=0xffff\n"
"key2=0.5\n"
"key3=1e37\n"
"key4=ten\n";
keyfile = load_data (data);
check_integer_value (keyfile, "valid", "key1", 0);
check_integer_value (keyfile, "valid", "key2", 1);
check_integer_value (keyfile, "valid", "key3", -1);
check_integer_value (keyfile, "valid", "key4", 2324431);
check_integer_value (keyfile, "valid", "key5", -2324431);
check_integer_value (keyfile, "valid", "key6", 111);
g_key_file_get_integer (keyfile, "invalid", "key1", &error);
check_error (&error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE);
g_key_file_get_integer (keyfile, "invalid", "key2", &error);
check_error (&error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE);
g_key_file_get_integer (keyfile, "invalid", "key3", &error);
check_error (&error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE);
g_key_file_get_integer (keyfile, "invalid", "key4", &error);
check_error (&error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE);
}
int
main (int argc, char *argv[])
{
test_line_ends ();
@@ -351,6 +414,7 @@ main (int argc, char *argv[])
test_listing ();
test_string ();
test_boolean ();
test_integer ();
return 0;
}