[Libreoffice-commits] libmspub.git: 2 commits - NEWS src/lib

[David Tardon]

 NEWS                       |    6 ++++++
 src/lib/MSPUBCollector.cpp |    4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit a374b9c963deeb485b80c8d534ad80b41e059cc6
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Feb 28 13:46:18 2018 +0100

    prepare for a release
    
    Change-Id: I844da04860cf29c8d947395e675eef6f045b7409

diff --git a/NEWS b/NEWS
index 2d7e214..d665867 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+libmspub 0.1.4
+
+- Fix several problems found by oss-fuzz.
+- Fix regression in closing shape groups that caused missing shapes on
+  second and subsequent pages. (tdf#116018)
+
 libmspub 0.1.3
 
 - Workaround a build error on some 32-bit systems.
commit a2e4fb779cff37a2cfc6ddf747d7715c545578a6
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Feb 28 13:40:08 2018 +0100

    tdf#116018 close shape group correctly
    
    Regression since commit bbe7f806b95ef427153ba18bff80e674b1704ae5 .
    
    Change-Id: Ib6d3f58373c7cb0e1ba7a7a720187cc68d9bc7b1

diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index fae688d..405470e 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -558,9 +558,7 @@ bool MSPUBCollector::endGroup()
   {
     return false;
   }
-  auto parent = m_currentShapeGroup->getParent();
-  if (parent)
-    m_currentShapeGroup = parent;
+  m_currentShapeGroup = m_currentShapeGroup->getParent();
   return true;
 }