diff options
| author | Lars Thorsen <[email protected]> | 2011-09-26 11:09:37 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2011-09-26 11:09:37 +0200 |
| commit | 97f3a064f27843a9f825210c1c7a27075b7b3ad7 (patch) | |
| tree | eab876b6e2b0b78e98df7217d15bcd2212d5fd4b /lib/xmerl/src/xmerl_scan.erl | |
| parent | abc8c8c9c18eaaec117f737389ed190e206c67f1 (diff) | |
| parent | 8cb06dd34e0febc6a147ca4a3d9775ad3baade83 (diff) | |
| download | otp-97f3a064f27843a9f825210c1c7a27075b7b3ad7.tar.gz otp-97f3a064f27843a9f825210c1c7a27075b7b3ad7.tar.bz2 otp-97f3a064f27843a9f825210c1c7a27075b7b3ad7.zip | |
Merge branch 'lars/xmerl/continuation-error/OTP-9457' into dev
* lars/xmerl/continuation-error/OTP-9457:
[xmerl] Fix streaming bug in xmerl_scan (Thanks to Simon Cornish)
Diffstat (limited to 'lib/xmerl/src/xmerl_scan.erl')
| -rw-r--r-- | lib/xmerl/src/xmerl_scan.erl | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl index e598c5f56d..25c6547497 100644 --- a/lib/xmerl/src/xmerl_scan.erl +++ b/lib/xmerl/src/xmerl_scan.erl @@ -2074,10 +2074,10 @@ scan_element(T, S, Pos, Name, StartL, StartC, Attrs, Lang, Parents, {AttName, NamespaceInfo, T1, S1} = scan_name(T, S), {T2, S2} = scan_eq(T1, S1), {AttType,_DefaultDecl} = get_att_type(S2,AttName,Name), - {AttValue, T3, S3,IsNorm} = scan_att_value(T2, S2, AttType), + {AttValue, T3a, S3a,IsNorm} = scan_att_value(T2, S2, AttType), %% check_default_value(S3,DefaultDecl,AttValue), NewNS = check_namespace(AttName, NamespaceInfo, AttValue, NS), - wfc_whitespace_betw_attrs(hd(T3),S3), + {T3,S3} = wfc_whitespace_betw_attrs(T3a,S3a), ?strip4, AttrPos = case Attrs of [] -> @@ -3284,12 +3284,17 @@ wfc_legal_char(Ch,S) -> end. -wfc_whitespace_betw_attrs(WS,_S) when ?whitespace(WS) -> - ok; -wfc_whitespace_betw_attrs($/,_S) -> - ok; -wfc_whitespace_betw_attrs($>,_S) -> - ok; +wfc_whitespace_betw_attrs([WS |_]=L,S) when ?whitespace(WS) -> + {L,S}; +wfc_whitespace_betw_attrs([$/ |_]=L,S) -> + {L,S}; +wfc_whitespace_betw_attrs([$> |_]=L,S) -> + {L,S}; +wfc_whitespace_betw_attrs([],S=#xmerl_scanner{continuation_fun = F}) -> + ?dbg("cont()...~n", []), + F(fun(MoreBytes, S1) -> wfc_whitespace_betw_attrs(MoreBytes, S1) end, + fun(S1) -> ?fatal(unexpected_end, S1) end, + S); wfc_whitespace_betw_attrs(_,S) -> ?fatal({whitespace_required_between_attributes},S). |