Merge pull request #247 from FairfieldTekLLC/master

Fixed for indexing strings out of bounds
zzzprojects · Sep 21, 2018 · e2ecdb6 · e2ecdb6
2 parents 3a6f0d2 + ac0507d
commit e2ecdb6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/HtmlAgilityPack.Shared/HtmlAttribute.cs b/src/HtmlAgilityPack.Shared/HtmlAttribute.cs
@@ -170,7 +170,10 @@ public string Value
 
                 if (_value == null)
                 {
-                    _value = _ownerdocument.Text.Substring(_valuestartindex, _valuelength);
+                    if (_ownerdocument.Text != null && _valuestartindex + _valuelength <= _ownerdocument.Text.Length)
+                        _value = _ownerdocument.Text.Substring(_valuestartindex, _valuelength);
+                    else
+                        _value = "";
 
                     if (!_ownerdocument.BackwardCompatibility)
                     {

diff --git a/src/HtmlAgilityPack.Shared/HtmlNode.cs b/src/HtmlAgilityPack.Shared/HtmlNode.cs
@@ -565,7 +565,9 @@ public virtual string OuterHtml
                     return string.Empty;
                 }
 
-                return _ownerdocument.Text.Substring(_outerstartindex, _outerlength);
+                if (_ownerdocument.Text != null && _outerstartindex + _outerlength <= _ownerdocument.Text.Length)
+                    return _ownerdocument.Text.Substring(_outerstartindex, _outerlength);
+                return string.Empty;
             }
         }