[xmerl] Fix streaming bug in xmerl_scan (Thanks to Simon Cornish)

3 files changed, 37 insertions, 13 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).
 
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index 50c0a79016..dfdc6138ef 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -355,9 +355,9 @@ initiate_state(Opts,Schema) ->
     XSDBase = filename:dirname(Schema),
     {{state,S},RestOpts}=new_state(Opts),
     S2 = create_tables(S),
-    S3 = initiate_state2(S2#xsd_state{schema_name = Schema, xsd_base=XSDBase,
-				      fetch_fun = fun fetch/2}, 
-			 RestOpts).
+    initiate_state2(S2#xsd_state{schema_name = Schema, xsd_base=XSDBase,
+				 fetch_fun = fun fetch/2}, 
+		    RestOpts).
 
 initiate_state2(S,[]) ->
     S;
diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index 0c809dbcb6..94c38d4d48 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -58,7 +58,7 @@ groups() ->
      {ticket_tests, [],
       [ticket_5998, ticket_7211, ticket_7214, ticket_7430,
        ticket_6873, ticket_7496, ticket_8156, ticket_8697,
-       ticket_9411]},
+       ticket_9411, ticket_9457]},
      {app_test, [], [{xmerl_app_test, all}]},
      {appup_test, [], [{xmerl_appup_test, all}]}].
 
@@ -588,7 +588,26 @@ ticket_9411(Config) ->
     ?line {E, _} = xmerl_scan:string(Xml),
     ?line {E, _} = xmerl_xsd:validate(E, Schema).
 
-
+ticket_9457(suite) -> [];
+ticket_9457(doc) -> 
+    ["Test that xmerl_scan handles continuation correct when current input runs out at the end of an attribute value"];
+ticket_9457(Config) ->
+    Opts = [{continuation_fun, fun ticket_9457_cont/3, start}, {space, normalize}],
+    ?line {E, _} = xmerl_scan:string([], Opts).
+
+ticket_9457_cont(Continue, Exception, GlobalState) ->
+    case xmerl_scan:cont_state(GlobalState) of
+	start ->
+	    G1 = xmerl_scan:cont_state(next, GlobalState),
+	    Bytes = "<?xml version=\"1.0\" ?>\r\n<item a=\"b\"",
+	    Continue(Bytes, G1);
+	next ->
+	    G1 = xmerl_scan:cont_state(last, GlobalState),
+	    Bytes = ">blah</item>\r\n",
+	    Continue(Bytes, G1);
+	_ ->
+	    Exception(GlobalState)
+    end.
 
 %%======================================================================
 %% Support Functions