[Libreoffice-commits] libmspub.git: 3 commits - configure.ac NEWS src/lib

[David Tardon]

 NEWS                    |   12 ++++++++++++
 configure.ac            |    2 +-
 src/lib/MSPUBParser.cpp |   14 +++++++-------
 3 files changed, 20 insertions(+), 8 deletions(-)

New commits:
commit fc4fdd7b1ab4278d14c88946f2c837d7eb4d880f
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 30 18:26:27 2014 +0100

    flush remaining text before checking spans
    
    Change-Id: I6938b0b13959a3ee83cfecae728c0a1a7baf531f

diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 3154294..2f2b805 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -1101,14 +1101,14 @@ bool MSPUBParser::parseQuill(librevenge::RVNGInputStream *input)
           readSpans.clear();
         }
       }
+      if (!text.empty() && currentTextSpan != spans.end())
+      {
+        readSpans.push_back(TextSpan(text, currentTextSpan->charStyle));
+        MSPUB_DEBUG_MSG(("Saw text span %d in the current text paragraph.\n", (unsigned)readSpans.size()));
+      }
+      text.clear();
       if (!readSpans.empty() && currentTextPara != paras.end())
       {
-        if (!text.empty() && currentTextSpan != spans.end())
-        {
-          readSpans.push_back(TextSpan(text, currentTextSpan->charStyle));
-          MSPUB_DEBUG_MSG(("Saw text span %d in the current text paragraph.\n", (unsigned)readSpans.size()));
-        }
-        text.clear();
         readParas.push_back(TextParagraph(readSpans, currentTextPara->paraStyle));
         MSPUB_DEBUG_MSG(("Saw paragraph %d in the current text block.\n", (unsigned)readParas.size()));
       }
commit b42a9c54d0fceec246dd4fef8679898efd611d60
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 30 18:23:01 2014 +0100

    coverity#1261355 using invalid iterator
    
    Change-Id: I9dfdfa89e2e1d895ea4d669a2dad480c5a8966ad

diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 0dca90c..3154294 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -1101,9 +1101,9 @@ bool MSPUBParser::parseQuill(librevenge::RVNGInputStream *input)
           readSpans.clear();
         }
       }
-      if (!readSpans.empty())
+      if (!readSpans.empty() && currentTextPara != paras.end())
       {
-        if (!text.empty())
+        if (!text.empty() && currentTextSpan != spans.end())
         {
           readSpans.push_back(TextSpan(text, currentTextSpan->charStyle));
           MSPUB_DEBUG_MSG(("Saw text span %d in the current text paragraph.\n", (unsigned)readSpans.size()));
commit d0e7664ffef9bafce5664948f03118fda3810002
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 30 17:33:27 2014 +0100

    prepare for a release
    
    Change-Id: I5569201cb5a41640ee786d3e0a7814c3e0e907d6

diff --git a/NEWS b/NEWS
index d4e236c..2202ba2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+libmspub 0.1.2
+
+- Check arguments of public functions. Passing NULL no longer causes
+  a crash.
+- Use symbol visibility on Linux. The library only exports the two public
+  functions now.
+- Fix several crashes and hangs when reading broken files, found with the help
+  of american-fuzzy-lop.
+- Add support for embedded fonts.
+- Add initial support for tables.
+- Parse document metadata.
+
 libmspub 0.1.1
 
 - Fix a crash when opening certain documents in LibreOffice, caused by a symbol
diff --git a/configure.ac b/configure.ac
index aa171e2..5c614d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # ====================
 m4_define([libmspub_version_major],[0])
 m4_define([libmspub_version_minor],[1])
-m4_define([libmspub_version_micro],[1])
+m4_define([libmspub_version_micro],[2])
 m4_define([libmspub_version],[libmspub_version_major.libmspub_version_minor.libmspub_version_micro])
 
 # =============