Browse Source

hl bugfix : don't call next() without checking hasNext()

Nicolas Cannasse 7 years ago
parent
commit
2b7cea8b23
1 changed files with 2 additions and 2 deletions
  1. 2 2
      std/haxe/rtti/XmlParser.hx

+ 2 - 2
std/haxe/rtti/XmlParser.hx

@@ -569,14 +569,14 @@ class XmlParser {
 			var evalues = x.has.v ? x.att.v.split(":").iterator() : null;
 			for( e in x.elements ) {
 				var opt = false;
-				var a = eargs.next();
+				var a = eargs.hasNext() ? eargs.next() : null;
 				if( a == null )
 					a = "";
 				if( a.charAt(0) == "?" ) {
 					opt = true;
 					a = a.substr(1);
 				}
-				var v = evalues == null ? null : evalues.next();
+				var v = evalues == null || !evalues.hasNext() ? null : evalues.next();
 				args.push({
 					name : a,
 					opt : opt,