Skip to content

Avoid NUL-terminated ISO 8601 component checks #177

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

Merged
nobu merged 1 commit into from
Jul 15, 2026
+14 −4
Merged

Avoid NUL-terminated ISO 8601 component checks #177

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
18 changes: 14 additions & 4 deletions ext/date/date_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2325,6 +2325,16 @@ sec_fraction(VALUE f)

#define SNUM 14

#ifndef rb_streql_lit
static inline int
rb_streql_cstr(VALUE str, const char *lit, size_t len)
{
if ((size_t)RSTRING_LEN(str) != len) return 0;
return memcmp(RSTRING_PTR(str), lit, len) == 0;
}
#define rb_streql_lit(str, lit) rb_streql_cstr(str, lit, sizeof(lit "") - 1)
#endif

static int
iso8601_ext_datetime_cb(VALUE m, VALUE hash)
{
Expand All @@ -2339,14 +2349,14 @@ iso8601_ext_datetime_cb(VALUE m, VALUE hash)

if (!NIL_P(s[1])) {
if (!NIL_P(s[3])) set_hash("mday", str2num(s[3]));
if (strcmp(RSTRING_PTR(s[1]), "-") != 0) {
if (!rb_streql_lit(s[1], "-")) {
y = str2num(s[1]);
if (RSTRING_LEN(s[1]) < 4)
y = comp_year69(y);
set_hash("year", y);
}
if (NIL_P(s[2])) {
if (strcmp(RSTRING_PTR(s[1]), "-") != 0)
if (!rb_streql_lit(s[1], "-"))
return 0;
}
else
Expand Down Expand Up @@ -2425,14 +2435,14 @@ iso8601_bas_datetime_cb(VALUE m, VALUE hash)

if (!NIL_P(s[3])) {
set_hash("mday", str2num(s[3]));
if (strcmp(RSTRING_PTR(s[1]), "--") != 0) {
if (!rb_streql_lit(s[1], "--")) {
y = str2num(s[1]);
if (RSTRING_LEN(s[1]) < 4)
y = comp_year69(y);
set_hash("year", y);
}
if (*RSTRING_PTR(s[2]) == '-') {
if (strcmp(RSTRING_PTR(s[1]), "--") != 0)
if (!rb_streql_lit(s[1], "--"))
return 0;
}
else
Expand Down