Skip to content

Do not repeat conversions to string #140

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
Oct 6, 2025
Merged

Do not repeat conversions to string #140

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
20 changes: 10 additions & 10 deletions ext/date/date_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4464,18 +4464,19 @@ get_limit(VALUE opt)
#define rb_category_warn(category, fmt) rb_warn(fmt)
#endif

static void
static VALUE
check_limit(VALUE str, VALUE opt)
{
size_t slen, limit;
if (NIL_P(str)) return;
if (NIL_P(str)) return str;
StringValue(str);
slen = RSTRING_LEN(str);
limit = get_limit(opt);
if (slen > limit) {
rb_raise(rb_eArgError,
"string length (%"PRI_SIZE_PREFIX"u) exceeds the limit %"PRI_SIZE_PREFIX"u", slen, limit);
}
return str;
}

static VALUE
Expand All @@ -4484,8 +4485,7 @@ date_s__parse_internal(int argc, VALUE *argv, VALUE klass)
VALUE vstr, vcomp, hash, opt;

argc = rb_scan_args(argc, argv, "11:", &vstr, &vcomp, &opt);
check_limit(vstr, opt);
StringValue(vstr);
vstr = check_limit(vstr, opt);
if (!rb_enc_str_asciicompat_p(vstr))
rb_raise(rb_eArgError,
"string should have ASCII compatible encoding");
Expand Down Expand Up @@ -4620,7 +4620,7 @@ date_s__iso8601(int argc, VALUE *argv, VALUE klass)
VALUE str, opt;

rb_scan_args(argc, argv, "1:", &str, &opt);
check_limit(str, opt);
str = check_limit(str, opt);

return date__iso8601(str);
}
Expand Down Expand Up @@ -4690,7 +4690,7 @@ date_s__rfc3339(int argc, VALUE *argv, VALUE klass)
VALUE str, opt;

rb_scan_args(argc, argv, "1:", &str, &opt);
check_limit(str, opt);
str = check_limit(str, opt);

return date__rfc3339(str);
}
Expand Down Expand Up @@ -4759,7 +4759,7 @@ date_s__xmlschema(int argc, VALUE *argv, VALUE klass)
VALUE str, opt;

rb_scan_args(argc, argv, "1:", &str, &opt);
check_limit(str, opt);
str = check_limit(str, opt);

return date__xmlschema(str);
}
Expand Down Expand Up @@ -4828,7 +4828,7 @@ date_s__rfc2822(int argc, VALUE *argv, VALUE klass)
VALUE str, opt;

rb_scan_args(argc, argv, "1:", &str, &opt);
check_limit(str, opt);
str = check_limit(str, opt);

return date__rfc2822(str);
}
Expand Down Expand Up @@ -4896,7 +4896,7 @@ date_s__httpdate(int argc, VALUE *argv, VALUE klass)
VALUE str, opt;

rb_scan_args(argc, argv, "1:", &str, &opt);
check_limit(str, opt);
str = check_limit(str, opt);

return date__httpdate(str);
}
Expand Down Expand Up @@ -4965,7 +4965,7 @@ date_s__jisx0301(int argc, VALUE *argv, VALUE klass)
VALUE str, opt;

rb_scan_args(argc, argv, "1:", &str, &opt);
check_limit(str, opt);
str = check_limit(str, opt);

return date__jisx0301(str);
}
Expand Down