Merge branch 'lheinfiniteloop' into 'master'

Implement treatment of <![CDATA[ in LHEF Closes #80 See merge request hepmc/HepMC3!340
hep-mirrors · Apr 17, 2024 · ca05dea · ca05dea
2 parents 2c45fd5 + a3a0da2
commit ca05dea
Show file tree

Hide file tree

Showing 4 changed files with 1,154 additions and 0 deletions.
diff --git a/include/HepMC3/LHEF.h b/include/HepMC3/LHEF.h
@@ -220,6 +220,21 @@ struct XMLTag {
         continue;
       }
 
+      // Check for character data
+      if ( begin != end && str.find("<![CDATA[", curr) == begin ) {
+        pos_t endcom = str.find("]]>", begin);
+        tags.push_back(new XMLTag());
+        if ( endcom == end ) {
+          tags.back()->contents = str.substr(curr);
+          if ( leftover ) *leftover += str.substr(curr);
+          return tags;
+        }
+        tags.back()->contents = str.substr(curr, endcom - curr);
+        if ( leftover ) *leftover += str.substr(curr, endcom - curr);
+        curr = endcom;
+        continue;
+      }
+
       if ( begin != curr ) {
         tags.push_back(new XMLTag());
         tags.back()->contents = str.substr(curr, begin - curr);

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -128,6 +128,7 @@ set( HepMC_tests
         testIO8
         testIO11
         testIO12
+        testIO13
         testReaderFactory1
         testSingleVertexHepMC2
         testAttributes