summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-17 13:20:50 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-17 13:20:50 (GMT)
commit5685abe6c3b028bb72647305987cdea694cd78e2 (patch)
tree71cf9a064f4f7a32b73367a45c8abf20893ce6e5 /time.c
parent61313ade46f71b783336b64049ad11459a208061 (diff)
time.c: ignore invalid data
* time.c (time_mload): ignore invalid offset and zone. [ruby-core:56648] [Bug #8795] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/time.c b/time.c
index 68a6b7e..8c04956 100644
--- a/time.c
+++ b/time.c
@@ -754,7 +754,8 @@ static VALUE time_utc_offset _((VALUE));
static int obj2int(VALUE obj);
static VALUE obj2vint(VALUE obj);
static int month_arg(VALUE arg);
-static void validate_utc_offset(VALUE utc_offset);
+static VALUE validate_utc_offset(VALUE utc_offset);
+static VALUE validate_zone_name(VALUE zone_name);
static void validate_vtm(struct vtm *vtm);
static int obj2subsecx(VALUE obj, VALUE *subsecx);
@@ -2581,11 +2582,19 @@ month_arg(VALUE arg)
return mon;
}
-static void
+static VALUE
validate_utc_offset(VALUE utc_offset)
{
if (le(utc_offset, INT2FIX(-86400)) || ge(utc_offset, INT2FIX(86400)))
rb_raise(rb_eArgError, "utc_offset out of range");
+ return utc_offset;
+}
+
+static VALUE
+validate_zone_name(VALUE zone_name)
+{
+ StringValueCStr(zone_name);
+ return zone_name;
}
static void
@@ -4702,8 +4711,9 @@ time_mload(VALUE time, VALUE str)
get_attr(nano_num, {});
get_attr(nano_den, {});
get_attr(submicro, {});
- get_attr(offset, validate_utc_offset(offset));
- get_attr(zone, {});
+ get_attr(offset, (offset = rb_rescue(validate_utc_offset, offset, NULL, Qnil)));
+ get_attr(zone, (zone = rb_rescue(validate_zone_name, zone, NULL, Qnil)));
+
#undef get_attr
rb_copy_generic_ivar(time, str);
@@ -4789,7 +4799,7 @@ end_submicro: ;
time_fixoff(time);
}
if (!NIL_P(zone)) {
- tobj->vtm.zone = StringValueCStr(zone);
+ tobj->vtm.zone = RSTRING_PTR(zone);
}
return time;