fix destruction

Author: andiwand

src/odr/internal/oldms_wvware/wvware_oldms_file.cpp

@@ -13,6 +13,8 @@ struct WvWareLegacyMicrosoftFile::ParserState {
 
   wvParseStruct ps{};
   int encryption_flag{};
+
+  ~ParserState() { wvOLEFree(&ps); }
 };
 
 WvWareLegacyMicrosoftFile::WvWareLegacyMicrosoftFile(
@@ -44,10 +46,6 @@ WvWareLegacyMicrosoftFile::WvWareLegacyMicrosoftFile(
   open();
 }
 
-WvWareLegacyMicrosoftFile::~WvWareLegacyMicrosoftFile() {
-  wvOLEFree(&m_parser_state->ps);
-}
-
 void WvWareLegacyMicrosoftFile::open() {
   wvInit();
 
@@ -68,7 +66,6 @@ void WvWareLegacyMicrosoftFile::open() {
   }
 
   if (ret != 0) {
-    wvOLEFree(&m_parser_state->ps);
     throw std::runtime_error("wvInitParser failed");
   }
 }

src/odr/internal/oldms_wvware/wvware_oldms_file.hpp

@@ -21,7 +21,6 @@ class WvWareLegacyMicrosoftFile final : public abstract::DocumentFile {
 public:
   explicit WvWareLegacyMicrosoftFile(std::shared_ptr<common::DiskFile> file);
   explicit WvWareLegacyMicrosoftFile(std::shared_ptr<common::MemoryFile> file);
-  ~WvWareLegacyMicrosoftFile() final;
 
   [[nodiscard]] std::shared_ptr<abstract::File> file() const noexcept final;
 

test/src/html_output_test.cpp

@@ -81,12 +81,6 @@ TEST_P(HtmlOutputTests, html_meta) {
     GTEST_SKIP();
   }
 
-  // TODO check wvware decryption
-  if ((test_file.type == FileType::legacy_word_document) &&
-      (engine == DecoderEngine::wvware)) {
-    GTEST_SKIP();
-  }
-
   if (file.is_document_file()) {
     DocumentFile document_file = file.document_file();