diff options
| author | Brian Inglis <Brian.Inglis@SystematicSW.ab.ca> | 2024-01-08 06:56:21 -0700 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2024-01-08 17:01:25 +0100 |
| commit | 9a863f713af24a3b18c165c640c936a4c0b707ea (patch) | |
| tree | bcdac8c5fefc8313283ed3708db6b301b7130eca /newlib/libc | |
| parent | 573458e7fc4f5247874b139a17e7e54827c92440 (diff) | |
| download | newlib-9a863f713af24a3b18c165c640c936a4c0b707ea.zip newlib-9a863f713af24a3b18c165c640c936a4c0b707ea.tar.gz newlib-9a863f713af24a3b18c165c640c936a4c0b707ea.tar.bz2 | |
fix strverscmp comparison of digit sequence with non-digits
From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 7 Nov 2022 22:17:55 -0500
the rule that longest digit sequence not beginning with a zero is
greater only applies when both sequences being compared are
non-degenerate. this is spelled out explicitly in the man page, which
may be deemed authoritative for this nonstandard function: "If one or
both of these is empty, then return what strcmp(3) would have
returned..."
we were wrongly treating any sequence of digits not beginning with a
zero as greater than a non-digit in the other string.
Signed-off-by: Brian Inglis <Brian.Inglis@SystematicSW.ab.ca>
Diffstat (limited to 'newlib/libc')
| -rw-r--r-- | newlib/libc/string/strverscmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/newlib/libc/string/strverscmp.c b/newlib/libc/string/strverscmp.c index 04aa721..0117421 100644 --- a/newlib/libc/string/strverscmp.c +++ b/newlib/libc/string/strverscmp.c @@ -76,9 +76,9 @@ int strverscmp(const char *l0, const char *r0) else if (c!='0') z=0; } - if (l[dp]!='0' && r[dp]!='0') { - /* If we're not looking at a digit sequence that began - * with a zero, longest digit string is greater. */ + if (l[dp]-'1'<9U && r[dp]-'1'<9U) { + /* If we're looking at non-degenerate digit sequences starting + * with nonzero digits, longest digit string is greater. */ for (j=i; isdigit(l[j]); j++) if (!isdigit(r[j])) return 1; if (isdigit(r[j])) return -1; |