diff --git a/src/Markdig/Helpers/CharHelper.cs b/src/Markdig/Helpers/CharHelper.cs
index 7ea8972c..31f5cd10 100644
--- a/src/Markdig/Helpers/CharHelper.cs
+++ b/src/Markdig/Helpers/CharHelper.cs
@@ -17,9 +17,9 @@ namespace Markdig.Helpers
{
public const int TabSize = 4;
- public const char ZeroSafeChar = '\uFFFD';
+ public const char ReplacementChar = '\uFFFD';
- public const string ZeroSafeString = "\uFFFD";
+ public const string ReplacementCharString = "\uFFFD";
private const char HighSurrogateStart = '\ud800';
private const char HighSurrogateEnd = '\udbff';
diff --git a/src/Markdig/Helpers/EntityHelper.cs b/src/Markdig/Helpers/EntityHelper.cs
index 96731fb2..4fd7f328 100644
--- a/src/Markdig/Helpers/EntityHelper.cs
+++ b/src/Markdig/Helpers/EntityHelper.cs
@@ -33,6 +33,7 @@
using System;
using System.Collections.Generic;
+using System.Text;
namespace Markdig.Helpers
{
@@ -60,8 +61,8 @@ namespace Markdig.Helpers
/// The unicode character set or null if the entity was not recognized.
public static string DecodeEntity(int utf32)
{
- if (!CharHelper.IsInInclusiveRange(utf32, 0, 1114111) || CharHelper.IsInInclusiveRange(utf32, 55296, 57343))
- return null;
+ if (!CharHelper.IsInInclusiveRange(utf32, 1, 1114111) || CharHelper.IsInInclusiveRange(utf32, 55296, 57343))
+ return CharHelper.ReplacementCharString;
if (utf32 < 65536)
return char.ToString((char)utf32);
@@ -80,6 +81,24 @@ namespace Markdig.Helpers
});
}
+ public static void DecodeEntity(int utf32, StringBuilder sb)
+ {
+ if (!CharHelper.IsInInclusiveRange(utf32, 1, 1114111) || CharHelper.IsInInclusiveRange(utf32, 55296, 57343))
+ {
+ sb.Append(CharHelper.ReplacementChar);
+ }
+ else if (utf32 < 65536)
+ {
+ sb.Append((char)utf32);
+ }
+ else
+ {
+ utf32 -= 65536;
+ sb.Append((char)((uint)utf32 / 1024 + 55296));
+ sb.Append((char)((uint)utf32 % 1024 + 56320));
+ }
+ }
+
#region [ EntityMap ]
///
/// Source: http://www.w3.org/html/wg/drafts/html/master/syntax.html#named-character-references
diff --git a/src/Markdig/Helpers/HtmlHelper.cs b/src/Markdig/Helpers/HtmlHelper.cs
index b8a490d8..4d385ad3 100644
--- a/src/Markdig/Helpers/HtmlHelper.cs
+++ b/src/Markdig/Helpers/HtmlHelper.cs
@@ -450,11 +450,7 @@ namespace Markdig.Helpers
while ((searchPos = text.IndexOfAny(search, searchPos)) != -1)
{
- if (sb == null)
- {
- sb = StringBuilderCache.Local();
- sb.Length = 0;
- }
+ sb ??= StringBuilderCache.Local();
c = text[searchPos];
if (removeBackSlash && c == '\\')
{
@@ -472,10 +468,7 @@ namespace Markdig.Helpers
}
else if (c == '&')
{
- int entityNameStart;
- int entityNameLength;
- int numericEntity;
- var match = ScanEntity(new StringSlice(text, searchPos, text.Length - 1), out numericEntity, out entityNameStart, out entityNameLength);
+ var match = ScanEntity(new StringSlice(text, searchPos, text.Length - 1), out int numericEntity, out int entityNameStart, out int entityNameLength);
if (match == 0)
{
searchPos++;
@@ -497,36 +490,18 @@ namespace Markdig.Helpers
else if (numericEntity >= 0)
{
sb.Append(text, lastPos, searchPos - match - lastPos);
- if (numericEntity == 0)
- {
- sb.Append('\0'.EscapeInsecure());
- }
- else
- {
- var decoded = EntityHelper.DecodeEntity(numericEntity);
- if (decoded != null)
- {
- sb.Append(decoded);
- }
- else
- {
- sb.Append('\uFFFD');
- }
- }
-
+ EntityHelper.DecodeEntity(numericEntity, sb);
lastPos = searchPos;
}
}
}
}
- if (sb == null)
+ if (sb == null || lastPos == 0)
return text;
sb.Append(text, lastPos, text.Length - lastPos);
- var result = sb.ToString();
- sb.Length = 0;
- return result;
+ return sb.GetStringAndReset();
}
///
diff --git a/src/Markdig/Parsers/Inlines/HtmlEntityParser.cs b/src/Markdig/Parsers/Inlines/HtmlEntityParser.cs
index fbe68dd9..3b423664 100644
--- a/src/Markdig/Parsers/Inlines/HtmlEntityParser.cs
+++ b/src/Markdig/Parsers/Inlines/HtmlEntityParser.cs
@@ -39,7 +39,7 @@ namespace Markdig.Parsers.Inlines
}
else if (entityValue >= 0)
{
- literal = (entityValue == 0 ? null : EntityHelper.DecodeEntity(entityValue)) ?? CharHelper.ZeroSafeString;
+ literal = EntityHelper.DecodeEntity(entityValue);
}
return literal != null;
}
diff --git a/src/Markdig/Parsers/MarkdownParser.cs b/src/Markdig/Parsers/MarkdownParser.cs
index 7ba6a50a..011e98d9 100644
--- a/src/Markdig/Parsers/MarkdownParser.cs
+++ b/src/Markdig/Parsers/MarkdownParser.cs
@@ -131,7 +131,7 @@ namespace Markdig.Parsers
/// The text to secure.
private string FixupZero(string text)
{
- return text.Replace('\0', CharHelper.ZeroSafeChar);
+ return text.Replace('\0', CharHelper.ReplacementChar);
}
private sealed class ContainerItemCache : DefaultObjectCache