Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

TimeZoneInfo: Avoid cloning privately-created ArgumentRule[] arrays #8575

Merged
merged 1 commit into from
Dec 10, 2016
Merged
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions src/mscorlib/src/System/TimeZoneInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1266,16 +1266,13 @@ private TimeZoneInfo(
Boolean adjustmentRulesSupportDst;
ValidateTimeZoneInfo(id, baseUtcOffset, adjustmentRules, out adjustmentRulesSupportDst);

if (!disableDaylightSavingTime && adjustmentRules != null && adjustmentRules.Length > 0) {
m_adjustmentRules = (AdjustmentRule[])adjustmentRules.Clone();
}

m_id = id;
m_baseUtcOffset = baseUtcOffset;
m_displayName = displayName;
m_standardDisplayName = standardDisplayName;
m_daylightDisplayName = (disableDaylightSavingTime ? null : daylightDisplayName);
m_supportsDaylightSavingTime = adjustmentRulesSupportDst && !disableDaylightSavingTime;
m_adjustmentRules = adjustmentRules;
}

// -------- SECTION: factory methods -----------------*
Expand Down Expand Up @@ -1316,7 +1313,7 @@ static public TimeZoneInfo CreateCustomTimeZone(
String daylightDisplayName,
AdjustmentRule [] adjustmentRules) {

return new TimeZoneInfo(
return CreateCustomTimeZone(
id,
baseUtcOffset,
displayName,
Expand Down Expand Up @@ -1345,7 +1342,11 @@ static public TimeZoneInfo CreateCustomTimeZone(
AdjustmentRule [] adjustmentRules,
Boolean disableDaylightSavingTime) {

return new TimeZoneInfo(
if (!disableDaylightSavingTime && adjustmentRules?.Length > 0) {
adjustmentRules = (AdjustmentRule[])adjustmentRules.Clone();
}

return new TimeZoneInfo(
id,
baseUtcOffset,
displayName,
Expand Down Expand Up @@ -5086,7 +5087,7 @@ static public TimeZoneInfo GetDeserializedTimeZoneInfo(String source) {
AdjustmentRule[] rules = s.GetNextAdjustmentRuleArrayValue(false);

try {
return TimeZoneInfo.CreateCustomTimeZone(id, baseUtcOffset, displayName, standardName, daylightName, rules);
return new TimeZoneInfo(id, baseUtcOffset, displayName, standardName, daylightName, rules, disableDaylightSavingTime: false);
}
catch (ArgumentException ex) {
throw new SerializationException(Environment.GetResourceString("Serialization_InvalidData"), ex);
Expand Down