Skip to content

Commit 2f6a645

Browse files
committed
percent-util: use safe_atou_full() with refuse flags for the integer part
Refuse signs, leading zeros and non-decimal spellings (hex/octal) by parsing the integer part with safe_atou_full() in base 10 with SAFE_ATO_REFUSE_PLUS_MINUS|SAFE_ATO_REFUSE_LEADING_ZERO, as suggested in review. Signed inputs now fail with -EINVAL instead of -ERANGE; update the test expectations accordingly.
1 parent c5e7f0f commit 2f6a645

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎src/basic/percent-util.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
#include "string-util.h"
66

77
static int parse_parts_integer(const char *n) {
8-
int r, v;
8+
unsigned v;
9+
int r;
910

10-
r = safe_atoi(n, &v);
11+
/* Refuse signs, leading zeros and non-decimal forms: percentages are plain non-negative decimal
12+
* integers, so hex or octal spellings must not be accepted either. */
13+
r = safe_atou_full(n, 10 | SAFE_ATO_REFUSE_PLUS_MINUS | SAFE_ATO_REFUSE_LEADING_ZERO, &v);
1114
if (r < 0)
1215
return r;
13-
14-
/* Refuse negative values. Also check for the "-" explicitly, since safe_atoi() accepts "-0", which
15-
* would otherwise turn e.g. "-0.5%" into a positive value. */
16-
if (v < 0 || strchr(n, '-'))
16+
if (v > INT_MAX)
1717
return -ERANGE;
1818

19-
return v;
19+
return (int) v;
2020
}
2121

2222
static int parse_parts_value_whole(const char *p, const char *symbol) {

‎src/test/test-percent-util.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ TEST(parse_percent) {
1616
ASSERT_OK_EQ(parse_percent("0%"), 0);
1717
ASSERT_OK_EQ(parse_percent("55%"), 55);
1818
ASSERT_OK_EQ(parse_percent("100%"), 100);
19-
ASSERT_ERROR(parse_percent("-7%"), ERANGE);
20-
ASSERT_ERROR(parse_percent("-0%"), ERANGE);
19+
ASSERT_ERROR(parse_percent("-7%"), EINVAL);
20+
ASSERT_ERROR(parse_percent("-0%"), EINVAL);
2121
ASSERT_ERROR(parse_percent("107%"), ERANGE);
2222
ASSERT_ERROR(parse_percent("%"), EINVAL);
2323
ASSERT_ERROR(parse_percent("%%"), EINVAL);
@@ -46,8 +46,8 @@ TEST(parse_permille) {
4646
ASSERT_OK_EQ(parse_permille("0‰"), 0);
4747
ASSERT_OK_EQ(parse_permille("555‰"), 555);
4848
ASSERT_OK_EQ(parse_permille("1000‰"), 1000);
49-
ASSERT_ERROR(parse_permille("-7‰"), ERANGE);
50-
ASSERT_ERROR(parse_permille("-0‰"), ERANGE);
49+
ASSERT_ERROR(parse_permille("-7‰"), EINVAL);
50+
ASSERT_ERROR(parse_permille("-0‰"), EINVAL);
5151
ASSERT_ERROR(parse_permille("1007‰"), ERANGE);
5252
ASSERT_ERROR(parse_permille("‰"), EINVAL);
5353
ASSERT_ERROR(parse_permille("‰‰"), EINVAL);
@@ -60,9 +60,9 @@ TEST(parse_permille) {
6060
ASSERT_OK_EQ(parse_permille("55%"), 550);
6161
ASSERT_OK_EQ(parse_permille("55.5%"), 555);
6262
ASSERT_OK_EQ(parse_permille("100%"), 1000);
63-
ASSERT_ERROR(parse_permille("-7%"), ERANGE);
64-
ASSERT_ERROR(parse_permille("-0.5%"), ERANGE);
65-
ASSERT_ERROR(parse_permille(" -0.5%"), ERANGE);
63+
ASSERT_ERROR(parse_permille("-7%"), EINVAL);
64+
ASSERT_ERROR(parse_permille("-0.5%"), EINVAL);
65+
ASSERT_ERROR(parse_permille(" -0.5%"), EINVAL);
6666
ASSERT_ERROR(parse_permille("107%"), ERANGE);
6767
ASSERT_ERROR(parse_permille("%"), EINVAL);
6868
ASSERT_ERROR(parse_permille("%%"), EINVAL);
@@ -86,7 +86,7 @@ TEST(parse_permille_unbounded) {
8686
ASSERT_ERROR(parse_permille_unbounded("214748364.8%"), ERANGE);
8787
ASSERT_ERROR(parse_permille_unbounded("429496729.5%"), ERANGE);
8888
ASSERT_ERROR(parse_permille_unbounded("429496729.6%"), ERANGE);
89-
ASSERT_ERROR(parse_permille_unbounded("-0.1%"), ERANGE);
89+
ASSERT_ERROR(parse_permille_unbounded("-0.1%"), EINVAL);
9090
}
9191

9292
TEST(parse_permyriad) {
@@ -100,8 +100,8 @@ TEST(parse_permyriad) {
100100
ASSERT_OK_EQ(parse_permyriad("0‱"), 0);
101101
ASSERT_OK_EQ(parse_permyriad("555‱"), 555);
102102
ASSERT_OK_EQ(parse_permyriad("1000‱"), 1000);
103-
ASSERT_ERROR(parse_permyriad("-7‱"), ERANGE);
104-
ASSERT_ERROR(parse_permyriad("-0‱"), ERANGE);
103+
ASSERT_ERROR(parse_permyriad("-7‱"), EINVAL);
104+
ASSERT_ERROR(parse_permyriad("-0‱"), EINVAL);
105105
ASSERT_ERROR(parse_permyriad("10007‱"), ERANGE);
106106
ASSERT_ERROR(parse_permyriad("‱"), EINVAL);
107107
ASSERT_ERROR(parse_permyriad("‱‱"), EINVAL);
@@ -112,8 +112,8 @@ TEST(parse_permyriad) {
112112
ASSERT_OK_EQ(parse_permyriad("0‰"), 0);
113113
ASSERT_OK_EQ(parse_permyriad("555.5‰"), 5555);
114114
ASSERT_OK_EQ(parse_permyriad("1000.0‰"), 10000);
115-
ASSERT_ERROR(parse_permyriad("-7‰"), ERANGE);
116-
ASSERT_ERROR(parse_permyriad("-0.5‰"), ERANGE);
115+
ASSERT_ERROR(parse_permyriad("-7‰"), EINVAL);
116+
ASSERT_ERROR(parse_permyriad("-0.5‰"), EINVAL);
117117
ASSERT_ERROR(parse_permyriad("1007‰"), ERANGE);
118118
ASSERT_ERROR(parse_permyriad("‰"), EINVAL);
119119
ASSERT_ERROR(parse_permyriad("‰‰"), EINVAL);
@@ -127,9 +127,9 @@ TEST(parse_permyriad) {
127127
ASSERT_OK_EQ(parse_permyriad("55.50%"), 5550);
128128
ASSERT_OK_EQ(parse_permyriad("55.53%"), 5553);
129129
ASSERT_OK_EQ(parse_permyriad("100%"), 10000);
130-
ASSERT_ERROR(parse_permyriad("-7%"), ERANGE);
131-
ASSERT_ERROR(parse_permyriad("-0.5%"), ERANGE);
132-
ASSERT_ERROR(parse_permyriad("-0.05%"), ERANGE);
130+
ASSERT_ERROR(parse_permyriad("-7%"), EINVAL);
131+
ASSERT_ERROR(parse_permyriad("-0.5%"), EINVAL);
132+
ASSERT_ERROR(parse_permyriad("-0.05%"), EINVAL);
133133
ASSERT_ERROR(parse_permyriad("107%"), ERANGE);
134134
ASSERT_ERROR(parse_permyriad("%"), EINVAL);
135135
ASSERT_ERROR(parse_permyriad("%%"), EINVAL);
@@ -159,8 +159,8 @@ TEST(parse_permyriad_unbounded) {
159159
ASSERT_ERROR(parse_permyriad_unbounded("21474836.48%"), ERANGE);
160160
ASSERT_ERROR(parse_permyriad_unbounded("42949672.95%"), ERANGE);
161161
ASSERT_ERROR(parse_permyriad_unbounded("42949672.96%"), ERANGE);
162-
ASSERT_ERROR(parse_permyriad_unbounded("-0.5‰"), ERANGE);
163-
ASSERT_ERROR(parse_permyriad_unbounded("-0.01%"), ERANGE);
162+
ASSERT_ERROR(parse_permyriad_unbounded("-0.5‰"), EINVAL);
163+
ASSERT_ERROR(parse_permyriad_unbounded("-0.01%"), EINVAL);
164164
}
165165

166166
TEST(scale) {

0 commit comments

Comments
 (0)