fix(quicktimevideo) cleanup and hardening as suggested in review by @…

…kevinbackhouse
Exiv2 · Aug 24, 2022 · c694e1d · c694e1d
1 parent 7f8efb4
commit c694e1d
Show file tree

Hide file tree

Showing 3 changed files with 198 additions and 227 deletions.
diff --git a/include/exiv2/basicio.hpp b/include/exiv2/basicio.hpp
@@ -132,7 +132,7 @@ class EXIV2API BasicIo {
         read if \em rcount bytes are not available.
     @param err Error code to use if an exception is thrown.
    */
-  void readOrThrow(byte* buf, size_t rcount, ErrorCode err);
+  void readOrThrow(byte* buf, size_t rcount, ErrorCode err = ErrorCode::kerCorruptedMetadata);
   /*!
     @brief Read one byte from the IO source. Current IO position is
         advanced by one byte.

diff --git a/include/exiv2/quicktimevideo.hpp b/include/exiv2/quicktimevideo.hpp
@@ -71,7 +71,7 @@ class QuickTimeVideo : public Image {
     @brief Check for a valid tag and decode the block at the current IO
     position. Calls tagDecoder() or skips to next tag, if required.
    */
-  void decodeBlock();
+  void decodeBlock(std::string const& parent_box = "");
   /*!
     @brief Interpret tag information, and call the respective function
         to save it in the respective XMP container. Decodes a Tag