[Libreoffice-commits] libcdr.git: src/lib

Miklos Vajna vmiklos at collabora.co.uk
Mon Nov 27 07:31:44 UTC 2017


 src/lib/CMXParser.cpp |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit e646d40f53bfb112abfd8153268665f73153b00c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Nov 27 08:31:23 2017 +0100

    CMXParser: remove never read length / maxLength
    
    Technically both were read and written at least once so the compiler did
    not warn on them; but in practice these are unused. Leave the readU32()
    call there, though -- as it has a side effect.
    
    Change-Id: I24240ef216b6ce18d792594ff77fad46e6688508

diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
index 9cbfecc..57a6f5e 100644
--- a/src/lib/CMXParser.cpp
+++ b/src/lib/CMXParser.cpp
@@ -345,10 +345,7 @@ void libcdr::CMXParser::readIxmr(librevenge::RVNGInputStream *input)
   unsigned fourCC = readU32(input, m_bigEndian);
   if (CDR_FOURCC_ixmr != fourCC)
     return;
-  unsigned length = readU32(input, m_bigEndian);
-  const unsigned long maxLength = getRemainingLength(input);
-  if (length > maxLength)
-    length = maxLength;
+  readU32(input, m_bigEndian); // Length
 
   readU16(input, m_bigEndian); // Master ID
   readU16(input, m_bigEndian); // Size


More information about the Libreoffice-commits mailing list