Skip to content

Fix NaN regression in double parameter validation #11731

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

Open
wnvko-msft wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix NaN regression in double parameter validation #11731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2cf0fc
Fix NaN regression in double parameter validation
wnvko-msft Jun 24, 2026
b7274b0
Add unit tests for NaN validation in double properties
wnvko-msft Jun 24, 2026
6b4335e
Apply suggestions from code review
wnvko-msft Jun 24, 2026
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
17 changes: 12 additions & 5 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextFormatterImp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Windows.Media;
Expand Down Expand Up @@ -460,12 +460,19 @@ TextRunCache textRunCache

double realMaxFontRenderingEmSize = Constants.RealInfiniteWidth / Constants.GreatestMutiplierOfEm;

ArgumentOutOfRangeException.ThrowIfNegative(paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize, "paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize");
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize, realMaxFontRenderingEmSize, "paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize");
if ( paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize < 0
|| paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize > realMaxFontRenderingEmSize)
{
throw new ArgumentOutOfRangeException("paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize", SR.Format(SR.ParameterMustBeBetween, 0, realMaxFontRenderingEmSize));
}

ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.Indent, Constants.RealInfiniteWidth, "paragraphProperties.Indent");
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.LineHeight, Constants.RealInfiniteWidth, "paragraphProperties.LineHeight");
ArgumentOutOfRangeException.ThrowIfNegative(paragraphProperties.DefaultIncrementalTab, "paragraphProperties.DefaultIncrementalTab");
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.DefaultIncrementalTab, Constants.RealInfiniteWidth, "paragraphProperties.DefaultIncrementalTab");
if ( paragraphProperties.DefaultIncrementalTab < 0
|| paragraphProperties.DefaultIncrementalTab > Constants.RealInfiniteWidth)
{
throw new ArgumentOutOfRangeException("paragraphProperties.DefaultIncrementalTab", SR.Format(SR.ParameterMustBeBetween, 0, Constants.RealInfiniteWidth));
}
}


Expand Down
9 changes: 9 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1816,6 +1816,15 @@
<data name="PaginatorNegativePageNumber" xml:space="preserve">
<value>Page number cannot be negative.</value>
</data>
<data name="ParameterCannotBeNegative" xml:space="preserve">
<value>Parameter must be greater than or equal to zero.</value>
</data>
<data name="ParameterMustBeBetween" xml:space="preserve">
<value>The parameter value must be between '{0}' and '{1}'.</value>
</data>
<data name="ParameterMustBeGreaterThanZero" xml:space="preserve">
<value>The parameter value must be greater than zero.</value>
</data>
<data name="Parsers_IllegalToken" xml:space="preserve">
<value>Token is not valid.</value>
</data>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">Číslo stránky nemůže být záporné.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Nalezena nesprávná forma {0} při analýze řetězce {1}.</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">Die Seitenzahl kann nicht negativ sein.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Beim Analysieren der Zeichenfolge "{1}" wurde die ungültige Form "{0}" gefunden.</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">El número de página no puede ser negativo.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Se encontró un formato incorrecto "{0}" al analizar la cadena "{1}".</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">Le numéro de page ne peut pas être négatif.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Forme '{0}' incorrecte trouvée durant l'analyse de la chaîne '{1}'.</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">Il numero di pagina non può essere negativo.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">È stato trovato un formato non corretto '{0}' durante l'analisi della stringa '{1}'.</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">ページ番号は負の数にできません。</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">'{1}' 文字列の解析中に無効なフォーム '{0}' が見つかりました。</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">페이지 번호는 음수일 수 없습니다.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">'{1}' 문자열을 구문 분석하는 동안 잘못된 '{0}' 형식이 검색되었습니다.</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">Numer strony nie może być ujemny.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Znaleziono nieprawidłową formę „{0}” podczas analizy ciągu „{1}”.</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">O número da página não pode ser negativo.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Forma incorreta de '{0}' encontrada na análise da cadeia de caracteres '{1}'.</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">Номер страницы не может быть отрицательным.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">При синтаксическом анализе строки "{1}" обнаружена неправильная форма "{0}".</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">Sayfa numarası negatif olamaz.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">'{1}' dizesi ayrıştırılırken yanlış '{0}' biçimi bulundu.</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">页码不能为负数。</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">解析“{1}”字符串时发现格式“{0}”错误。</target>
Expand Down
15 changes: 15 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,21 @@
<target state="translated">頁碼不能為負數。</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="new">Parameter must be greater than or equal to zero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="new">The parameter value must be between '{0}' and '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="new">The parameter value must be greater than zero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">剖析 '{1}' 字串時發現不正確的格式 '{0}'。</target>
Expand Down
11 changes: 9 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/D3DImage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,15 @@ public D3DImage() : this(96.0, 96.0)
public D3DImage(double dpiX, double dpiY)
{

ArgumentOutOfRangeException.ThrowIfNegative(dpiX);
ArgumentOutOfRangeException.ThrowIfNegative(dpiY);
if (dpiX < 0)
{
throw new ArgumentOutOfRangeException(nameof(dpiX), SR.ParameterCannotBeNegative);
}

if (dpiY < 0)
{
throw new ArgumentOutOfRangeException(nameof(dpiY), SR.ParameterCannotBeNegative);
}

_canWriteEvent = new ManualResetEvent(true);
_availableCallback = Callback;
Expand Down
10 changes: 7 additions & 3 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FormattedText.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,9 @@ private static void ValidateCulture(CultureInfo culture)

private static void ValidateFontSize(double emSize)
{
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(emSize);
if (emSize <= 0)
throw new ArgumentOutOfRangeException(nameof(emSize), SR.ParameterMustBeGreaterThanZero);

ArgumentOutOfRangeException.ThrowIfGreaterThan(emSize, MaxFontEmSize);
ArgumentOutOfRangeException.ThrowIfEqual(emSize, double.NaN);
}
Expand Down Expand Up @@ -1223,7 +1225,8 @@ public double LineHeight
{
set
{
ArgumentOutOfRangeException.ThrowIfNegative(value);
if (value < 0)
throw new ArgumentOutOfRangeException(nameof(value), SR.ParameterCannotBeNegative);

_defaultParaProps.SetLineHeight(value);
InvalidateMetrics();
Expand All @@ -1246,7 +1249,8 @@ public double MaxTextWidth
{
set
{
ArgumentOutOfRangeException.ThrowIfNegative(value);
if (value < 0)
throw new ArgumentOutOfRangeException(nameof(value), SR.ParameterCannotBeNegative);
_maxTextWidth = value;
InvalidateMetrics();
}
Expand Down
Loading