avoid leaks (compatibility_converter)

Jang Myeongho · Jang Myeongho · commit c5c8bbf42507 · 2012-06-27T07:49:34.000Z
diff --git a/src/ifcparse/IfcCharacterDecoder.cpp b/src/ifcparse/IfcCharacterDecoder.cpp
@@ -90,10 +90,10 @@ void IfcCharacterDecoder::addChar(std::stringstream& s,const UChar32& ch) {
 IfcCharacterDecoder::IfcCharacterDecoder(IfcParse::File* f) {
   file = f;
 #ifdef HAVE_ICU
-  if (destination != nullptr) {
-    ucnv_close(destination);
-  }
+  if (destination) ucnv_close(destination);
+  if (compatibility_converter) ucnv_close(compatibility_converter);
   destination = nullptr;
+  compatibility_converter = nullptr;
 
   if (mode == DEFAULT) {
     destination = ucnv_open(nullptr, &status);
@@ -112,8 +112,10 @@ IfcCharacterDecoder::~IfcCharacterDecoder() {
 #ifdef HAVE_ICU
   if ( destination ) ucnv_close(destination);
   if ( converter ) ucnv_close(converter);
+  if ( compatibility_converter ) ucnv_close(compatibility_converter);
   destination = nullptr;
   converter = nullptr;
+  compatibility_converter = nullptr;
 #endif
 }
 IfcCharacterDecoder::operator std::string() {
