You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/01/17 23:52:48 UTC
[11/50] git commit: This is a fix for mochiweb_html:parse/1 getting
in an infinite loop when encountering some sorts of invalid HTML.
This is a fix for mochiweb_html:parse/1 getting in an infinite loop when encountering some sorts of invalid HTML.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/d064e459
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/d064e459
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/d064e459
Branch: refs/heads/import
Commit: d064e459da7665d8dd7aad6da63fce210c25452d
Parents: b0ef452
Author: unknown <Jeroen Koops@.(none)>
Authored: Mon Oct 4 19:51:10 2010 +0800
Committer: Bob Ippolito <bo...@redivi.com>
Committed: Fri Oct 8 15:56:24 2010 +0800
----------------------------------------------------------------------
src/mochiweb_html.erl | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/d064e459/src/mochiweb_html.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_html.erl b/src/mochiweb_html.erl
index 8ece619..5e95a42 100644
--- a/src/mochiweb_html.erl
+++ b/src/mochiweb_html.erl
@@ -489,8 +489,15 @@ skip_whitespace(B, S=#decoder{offset=O}) ->
S
end.
-tokenize_literal(Bin, S) ->
- tokenize_literal(Bin, S, []).
+tokenize_literal(Bin, S=#decoder{offset=O}) ->
+ case Bin of
+ <<_:O/binary, C, _/binary>> when C =:= $>
+ orelse C =:= $/
+ orelse C =:= $= ->
+ {{data,[C],false}, ?INC_COL(S)};
+ _ ->
+ tokenize_literal(Bin, S, [])
+ end.
tokenize_literal(Bin, S=#decoder{offset=O}, Acc) ->
case Bin of
@@ -603,7 +610,7 @@ tokenize_word_or_literal(Bin, S=#decoder{offset=O}) ->
tokenize_word(Bin, ?INC_COL(S), C);
<<_:O/binary, C, _/binary>> when not ?IS_WHITESPACE(C) ->
%% Sanity check for whitespace
- tokenize_literal(Bin, S, [])
+ tokenize_literal(Bin, S)
end.
tokenize_word(Bin, S, Quote) ->