Skip to content

Preserve explicit 64-bit suffixes when parsing nondecimal integers #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fhgffy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve explicit 64-bit suffixes when parsing nondecimal integers #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ int libconfig_parse_integer(const char *s, int base, long long *val,
errno = 0;
*val = strtoll(s, &endptr, base);

if((base != 10) && (*val > INT32_MAX) && (*val <= UINT32_MAX))
/* Only unsuffixed non-decimal values use 32-bit signed interpretation. */
if((base != 10) && (*endptr != 'L')
&& (*val > INT32_MAX) && (*val <= UINT32_MAX))
*val = (long long)(int)*val;

*is_long = ((*val < INT32_MIN) || (*val > INT32_MAX));
Expand Down
3 changes: 3 additions & 0 deletions tests/testdata/int64-suffix.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
hex = 0xFFFFFFFFL;
binary = 0b11111111111111111111111111111111L;
octal = 0o37777777777L;
3 changes: 3 additions & 0 deletions tests/testdata/int64-suffix.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
hex = 0xFFFFFFFFL;
binary = 0b11111111111111111111111111111111L;
octal = 4294967295L;
51 changes: 51 additions & 0 deletions tests/tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,56 @@ TT_TEST(BinaryAndHex)

/* ------------------------------------------------------------------------- */

TT_TEST(NonDecimalInt64Suffix)
{
static const struct
{
const char *text;
long long value;
int type;
} cases[] = {
{ "v = 0x7FFFFFFFL;", 2147483647LL, CONFIG_TYPE_INT64 },
{ "v = 0x80000000L;", 2147483648LL, CONFIG_TYPE_INT64 },
{ "v = 0xFFFFFFFFLL;", 4294967295LL, CONFIG_TYPE_INT64 },
{ "v = 0x100000000L;", 4294967296LL, CONFIG_TYPE_INT64 },
{ "v = 0b10000000000000000000000000000000L;", 2147483648LL,
CONFIG_TYPE_INT64 },
{ "v = 0b11111111111111111111111111111111LL;", 4294967295LL,
CONFIG_TYPE_INT64 },
{ "v = 0o20000000000L;", 2147483648LL, CONFIG_TYPE_INT64 },
{ "v = 0q37777777777LL;", 4294967295LL, CONFIG_TYPE_INT64 },
{ "v = 0xFFFFFFFF;", -1LL, CONFIG_TYPE_INT },
{ "v = 0b11111111111111111111111111111111;", -1LL, CONFIG_TYPE_INT },
{ "v = 0o37777777777;", -1LL, CONFIG_TYPE_INT },
{ "v = 4294967295L;", 4294967295LL, CONFIG_TYPE_INT64 },
{ "v = -2147483649L;", -2147483649LL, CONFIG_TYPE_INT64 },
{ "v = 0x7FFFFFFFFFFFFFFFL;", 9223372036854775807LL,
CONFIG_TYPE_INT64 }
};
unsigned int i;

for(i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i)
{
config_t cfg;
config_setting_t *setting;
config_init(&cfg);
TT_ASSERT_TRUE(config_read_string(&cfg, cases[i].text));
setting = config_lookup(&cfg, "v");
TT_ASSERT_PTR_NE(setting, NULL);
if(setting)
{
TT_ASSERT_INT_EQ(config_setting_type(setting), cases[i].type);
TT_ASSERT_INT64_EQ(config_setting_get_int64(setting), cases[i].value);
}
config_destroy(&cfg);
}

parse_and_compare("./testdata/int64-suffix.cfg",
"./testdata/int64-suffix.txt");
}

/* ------------------------------------------------------------------------- */

int main(int argc, char **argv)
{
int failures;
Expand All @@ -782,6 +832,7 @@ int main(int argc, char **argv)
TT_SUITE_TEST(LibConfigTests, IncludeReadError);
TT_SUITE_TEST(LibConfigTests, ReadStream);
TT_SUITE_TEST(LibConfigTests, BinaryAndHex);
TT_SUITE_TEST(LibConfigTests, NonDecimalInt64Suffix);
TT_SUITE_RUN(LibConfigTests);
failures = TT_SUITE_NUM_FAILURES(LibConfigTests);
TT_SUITE_END(LibConfigTests);
Expand Down