Fixed error in decoding HTML/XML character entities

kuhumcst · May 18, 2021 · ef09807 · ef09807
1 parent c7f32f6
commit ef09807
Show file tree

Hide file tree

Showing 9 changed files with 255 additions and 206 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,9 @@
+-------------------------------
+Version 8.1.2 (18 May 2021)
+-------------------------------
+Fixed error in decoding X/HTML entities, caused by calling virtual fnction from
+inside a constructor.
+
 -------------------------------
 Version 8.1.1 (17 April 2021)
 -------------------------------

diff --git a/src/XMLtext.cpp b/src/XMLtext.cpp
@@ -94,9 +94,9 @@ static void printXML(
                 fprintf(basefrm::m_fp,"&gt;");
                 break;
             case '&':
-                if(strchr(s+1,';'))
+                /*if(strchr(s+1,';'))
                     fputc('&',basefrm::m_fp);
-                else
+                else*/
                     fprintf(basefrm::m_fp,"&amp;");
                 break;
             case '\'':
@@ -523,24 +523,32 @@ void XMLtext::reachedTokenEnd(char * Ch)
 #if STREAM
 XMLtext::XMLtext(istream * fpi,optionStruct & Option)
 #else
-XMLtext::XMLtext(FILE * fpi,optionStruct & Option)
+XMLtext::XMLtext(FILE* fpi, optionStruct& Option)
+#endif
+    :text(Option.InputHasTags, Option.nice)
+    , Token(NULL)
+    , ancestor(Option.ancestor)
+    , element(Option.element)
+    , segment(Option.segment)
+    , POSAttribute(Option.POSAttribute)
+    , lemmaAttribute(Option.lemmaAttribute)
+    , lemmaClassAttribute(Option.lemmaClassAttribute)
+    , Crumbs(NULL)
+    , ClosingTag(false)
+    , WordPosComing(false)
+    , POSPosComing(false)
+    , LemmaPosComing(false)
+    , LemmaClassPosComing(false)
+    , alltext(NULL)
+    , wordAttribute(Option.wordAttribute)
+    {
+    }
+
+#if STREAM
+void XMLtext::DoYourWork(istream* fpi, optionStruct& Option)
+#else
+void XMLtext::DoYourWork(FILE* fpi, optionStruct& Option)
 #endif
-           :text(Option.InputHasTags,Option.nice)
-           ,Token(NULL)
-           ,ancestor(Option.ancestor)
-           ,element(Option.element)
-           ,segment(Option.segment)
-           ,POSAttribute(Option.POSAttribute)
-           ,lemmaAttribute(Option.lemmaAttribute)
-           ,lemmaClassAttribute(Option.lemmaClassAttribute)
-           ,Crumbs(NULL)
-           ,ClosingTag(false)
-           ,WordPosComing(false)
-           ,POSPosComing(false)
-           ,LemmaPosComing(false)
-           ,LemmaClassPosComing(false)
-           ,alltext(NULL)
-           ,wordAttribute(Option.wordAttribute)
     {
     StartOfLine = true;
 

diff --git a/src/XMLtext.h b/src/XMLtext.h
@@ -132,6 +132,14 @@ class XMLtext : public text
 */
             );
         ~XMLtext(){}
+        virtual void DoYourWork(
+#if STREAM
+            istream* fpi
+#else
+            FILE* fpi
+#endif
+            , optionStruct& Option
+        );
         virtual void printUnsorted(
 #if STREAM
             ostream * fpo

diff --git a/src/cstlemma.cpp b/src/cstlemma.cpp
@@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License
 along with CSTLEMMA; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-#define CSTLEMMAVERSION "8.1.1"
-#define CSTLEMMADATE "2021.04.17"
+#define CSTLEMMAVERSION "8.1.2"
+#define CSTLEMMADATE "2021.05.18"
 #define CSTLEMMACOPYRIGHT "2002-2021 Center for Sprogteknologi"
 
 #include "lemmatiser.h"