Skip to content

Commit c5113e5

Browse files
swmalswmal
authored andcommitted
v8.4.2 - Security patch
1 parent 0a82698 commit c5113e5

12 files changed

Lines changed: 57 additions & 28 deletions

File tree

‎appveyor8.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 8.4.2.{build}
1+
version: 8.4.3.{build}
22
branches:
33
only:
44
- develop8
@@ -10,15 +10,15 @@ install:
1010
& $env:temp\dotnet-install.ps1 -Architecture x64 -Version '10.0.100' -InstallDir "$env:ProgramFiles\dotnet"
1111
init:
1212
- ps: >-
13-
Update-AppveyorBuild -Version "8.4.2.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
13+
Update-AppveyorBuild -Version "8.4.3.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
1414
15-
Write-Host "8.4.2.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
15+
Write-Host "8.4.3.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
1616
dotnet_csproj:
1717
patch: true
1818
file: '**\*.csproj'
1919
version: '{version}'
20-
assembly_version: 8.4.2.{build}
21-
file_version: 8.4.2.{build}
20+
assembly_version: 8.4.3.{build}
21+
file_version: 8.4.3.{build}
2222
nuget:
2323
project_feed: true
2424
before_build:

‎src/Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
1010
<PackageVersion Include="System.Drawing.Common" Version="8.0.14" />
1111
<PackageVersion Include="System.Formats.Asn1" Version="8.0.2" />
12-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
13-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.2" />
12+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.5" />
13+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.5" />
1414
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
1515
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
1616
</ItemGroup>

‎src/EPPlus/DigitalSignatures/ExcelDigitalSignature.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ internal ExcelDigitalSignature(ExcelWorkbook wb, XmlNamespaceManager ns, ZipPack
127127
PreserveWhitespace = true,
128128
};
129129
//Full read only REALLY relevant for verification of signature
130-
_doc.Load(part.GetStream());
130+
XmlHelper.LoadXmlSafe(_doc, part.GetStream());
131131
var isVerified = IsValid;
132132

133133
//Read signing method

‎src/EPPlus/Drawing/Chart/Style/CrtxTemplateHelper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ internal static void LoadCrtx(Stream stream, out XmlDocument chartXml, out XmlDo
4141
{
4242
var chartPart = p.GetPart(chartRel.TargetUri);
4343
chartXml = new XmlDocument();
44-
chartXml.Load(chartPart.GetStream());
44+
XmlHelper.LoadXmlSafe(chartXml, chartPart.GetStream());
4545
var rels = chartPart.GetRelationships();
4646
foreach (var rel in rels)
4747
{
@@ -53,11 +53,11 @@ internal static void LoadCrtx(Stream stream, out XmlDocument chartXml, out XmlDo
5353
break;
5454
case ExcelPackage.schemaChartStyleRelationships:
5555
styleXml = new XmlDocument();
56-
styleXml.Load(part.GetStream());
56+
XmlHelper.LoadXmlSafe(styleXml, part.GetStream());
5757
break;
5858
case ExcelPackage.schemaChartColorStyleRelationships:
5959
colorsXml = new XmlDocument();
60-
colorsXml.Load(part.GetStream());
60+
XmlHelper.LoadXmlSafe(colorsXml, part.GetStream());
6161
break;
6262
}
6363
}

‎src/EPPlus/Drawing/Chart/Style/ExcelChartStyleManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ private ZipPackageRelationship CreateThemeOverridePart(ZipPackage p, ZipPackageP
996996
ThemeOverridePart = p.CreatePart(ThemeOverrideUri, ContentTypes.contentTypeThemeOverride);
997997

998998
ThemeOverrideXml = new XmlDocument();
999-
ThemeOverrideXml.Load(partToCopy.GetStream());
999+
XmlHelper.LoadXmlSafe(ThemeOverrideXml, partToCopy.GetStream());
10001000

10011001
foreach (var themeRel in partToCopy.GetRelationships())
10021002
{

‎src/EPPlus/Drawing/ImageHandling/ImageReader.cs‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -770,13 +770,27 @@ private static string ReadPngChunkHeader(BinaryReader br, out int length)
770770
var type = Encoding.ASCII.GetString(b);
771771
return type;
772772
}
773-
#endregion
774-
#region Svg
773+
#endregion
774+
#region Svg
775+
776+
private static XmlTextReader CreateSvgReader(MemoryStream ms)
777+
{
778+
var reader = new XmlTextReader(ms);
779+
#if NET35
780+
// NET35 has no DtdProcessing.Ignore. SVG files with a DOCTYPE
781+
// will not be recognized on this target.
782+
reader.ProhibitDtd = true;
783+
#else
784+
reader.DtdProcessing = DtdProcessing.Ignore;
785+
#endif
786+
reader.XmlResolver = null;
787+
return reader;
788+
}
775789
private static bool IsSvg(MemoryStream ms, ref double width, ref double height)
776790
{
777791
try
778792
{
779-
var reader = new XmlTextReader(ms);
793+
var reader = CreateSvgReader(ms);
780794
while (reader.Read())
781795
{
782796
if (reader.LocalName == "svg" && reader.NodeType == XmlNodeType.Element)
@@ -824,7 +838,7 @@ private static bool IsSvg(MemoryStream ms)
824838
try
825839
{
826840
ms.Position = 0;
827-
var reader = new XmlTextReader(ms);
841+
var reader = CreateSvgReader(ms);
828842
while (reader.Read())
829843
{
830844
if (reader.LocalName == "svg" && reader.NodeType == XmlNodeType.Element)

‎src/EPPlus/Drawing/Theme/ExcelThemeManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ public void CreateDefaultTheme()
7979
_defaultTheme = StyleResourceManager.GetItem("defaulttheme2022.Xml");
8080
}
8181
}
82-
var themeXml = new XmlDocument();
83-
themeXml.LoadXml(_defaultTheme);
82+
var themeXml = new XmlDocument();
83+
XmlHelper.LoadXmlSafe(themeXml, _defaultTheme, System.Text.Encoding.UTF8);
8484
Load(themeXml);
8585
}
8686
internal ExcelTheme GetOrCreateTheme()

‎src/EPPlus/EPPlus.csproj‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net8.0;net9.0;net10.0;netstandard2.1;netstandard2.0;net462;net35</TargetFrameworks>
4-
<AssemblyVersion>8.4.2.0</AssemblyVersion>
5-
<FileVersion>8.4.2.0</FileVersion>
6-
<Version>8.4.2</Version>
4+
<AssemblyVersion>8.4.3.0</AssemblyVersion>
5+
<FileVersion>8.4.3.0</FileVersion>
6+
<Version>8.4.3</Version>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
88
<PackageProjectUrl>https://epplussoftware.com</PackageProjectUrl>
99
<Authors>EPPlus Software AB</Authors>
@@ -18,14 +18,17 @@
1818
<PackageReadmeFile>readme.md</PackageReadmeFile>
1919
<Copyright>EPPlus Software AB</Copyright>
2020
<PackageReleaseNotes>
21-
EPPlus 8.4.2
21+
EPPlus 8.4.3
2222

2323
IMPORTANT NOTICE!
2424
From version 5 EPPlus changes the license model using a dual license, Polyform Non Commercial / Commercial license.
2525
EPPlus will still have the source available, but for non Polyform NC compliant projects, EPPlus will provide a commercial license.
2626
Commercial licenses can be purchased from https://epplussoftware.com
2727
This applies to EPPlus version 5 and later. Earlier versions are still licensed LGPL.
2828

29+
## Version 8.4.3
30+
* Security patch (Github advisory GHSA-f4h2-2r6m-w59r, CVE-2026-96222, CVE-2026-96958, CVE-2026-96959, CVE-2026-96960, CVE-2026-84008)
31+
2932
## Version 8.4.2
3033
* Minor bug fixes. See https://epplussoftware.com/Developers/MinorFeaturesAndIssues
3134

@@ -551,6 +554,7 @@
551554
A list of fixed issues can be found here https://epplussoftware.com/docs/7.0/articles/fixedissues.html
552555

553556
Version history
557+
8.4.3 20261016 Security patch (Github advisory GHSA-f4h2-2r6m-w59r, CVE-2026-96222, CVE-2026-96958, CVE-2026-96959, CVE-2026-96960, CVE-2026-84008)
554558
8.4.2 20260204 Minor bug fixes. See https://epplussoftware.com/Developers/MinorFeaturesAndIssues
555559
8.4.1 20260112 Minor bug fixes.
556560
8.4.0 20251212 Updated target frameworks. Minor bug fixes.
@@ -752,18 +756,18 @@
752756
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
753757
<PackageReference Include="Microsoft.Extensions.Configuration.Json" VersionOverride="9.0.3" />
754758
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
755-
<PackageReference Include="System.Security.Cryptography.Pkcs" VersionOverride="9.0.3" />
759+
<PackageReference Include="System.Security.Cryptography.Pkcs" VersionOverride="9.0.21" />
756760
<PackageReference Include="System.ComponentModel.Annotations" />
757761
<PackageReference Include="System.Text.Encoding.CodePages" VersionOverride="9.0.3" />
758-
<PackageReference Include="System.Security.Cryptography.Xml" VersionOverride="9.0.3" />
762+
<PackageReference Include="System.Security.Cryptography.Xml" VersionOverride="9.0.21" />
759763
</ItemGroup>
760764
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
761765
<PackageReference Include="Microsoft.Extensions.Configuration.Json" VersionOverride="10.0.0" />
762766
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
763-
<PackageReference Include="System.Security.Cryptography.Pkcs" VersionOverride="10.0.0" />
767+
<PackageReference Include="System.Security.Cryptography.Pkcs" VersionOverride="10.0.13" />
764768
<PackageReference Include="System.ComponentModel.Annotations" />
765769
<PackageReference Include="System.Text.Encoding.CodePages" VersionOverride="10.0.0" />
766-
<PackageReference Include="System.Security.Cryptography.Xml" VersionOverride="10.0.0" />
770+
<PackageReference Include="System.Security.Cryptography.Xml" VersionOverride="10.0.13" />
767771
</ItemGroup>
768772
<ItemGroup>
769773
<Compile Remove="LoadFunctions\HeaderReader.cs" />

‎src/EPPlus/ExcelWorkbook.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,9 @@ private void GetSharedStrings()
360360

361361
#else
362362
var xr = new XmlTextReader(part.GetStream());
363+
#endif
364+
#if NET35
365+
xr.ProhibitDtd = true;
363366
#endif
364367
int index = 0;
365368
while (xr.Read())

‎src/EPPlus/ExternalReferences/ExcelExternalLinksCollection.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@ internal void LoadExternalReferences()
9999
var rel = _wb.Part.GetRelationship(rID);
100100
var part = _wb._package.ZipPackage.GetPart(UriHelper.ResolvePartUri(rel.SourceUri, rel.TargetUri));
101101
var xr = new XmlTextReader(part.GetStream());
102+
#if NET35
103+
xr.ProhibitDtd = true;
104+
#else
105+
xr.DtdProcessing = DtdProcessing.Prohibit;
106+
#endif
102107
while (xr.Read())
103108
{
104109
if (xr.NodeType == XmlNodeType.Element)

0 commit comments

Comments
 (0)
⌂ 换网址