[cig-commits] commit: Fix parsing of <

[Mercurial]

changeset:   463:48b0252d8080
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Tue Jul 31 11:59:33 2012 -0700
files:       json_parser/print_xml.cxx
description:
Fix parsing of <


diff -r 516b0160cafc -r 48b0252d8080 json_parser/print_xml.cxx
--- a/json_parser/print_xml.cxx	Mon Jul 30 09:01:15 2012 -0700
+++ b/json_parser/print_xml.cxx	Tue Jul 31 11:59:33 2012 -0700
@@ -8,17 +8,17 @@ std::string fix_comparisons(const std::s
 std::string fix_comparisons(const std::string &s)
 {
   std::string result(s);
-  size_t i(result.find('<'));
+  size_t i=result.find('&');
+  while(i!=std::string::npos)
+    {
+      result.replace(i,1,"&amp;");
+      i=result.find('&',i+1);
+    }
+  i=result.find('<');
   while(i!=std::string::npos)
     {
       result.replace(i,1,"&lt;");
       i=result.find('<',i+1);
-    }
-  i=result.find('&');
-  while(i!=std::string::npos)
-    {
-      result.replace(i,1,"&amp;");
-      i=result.find('&',i+1);
     }
   return result;
 }