Merge pull request #70 from softvise/fix_double_free

Fix a double-free error with ExternalReference.
jklimke · Jun 27, 2022 · 4dacf5d · 4dacf5d
2 parents 6e2b9c8 + 74410e2
commit 4dacf5d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/sources/include/citygml/citygmlfactory.h b/sources/include/citygml/citygmlfactory.h
@@ -41,7 +41,7 @@ namespace citygml {
 
         std::shared_ptr<Polygon> createPolygon(const std::string& id);
         std::shared_ptr<LineString> createLineString(const std::string& id);
-        std::shared_ptr<ExternalReference> createExternalReference(const std::string& id);
+        ExternalReference* createExternalReference(const std::string& id);
 
         /**
          * @brief requests a polygon for a Geometry object that will be added later

diff --git a/sources/include/parser/externalreferenceparser.h b/sources/include/parser/externalreferenceparser.h
@@ -25,7 +25,7 @@ namespace citygml {
         virtual Object* getObject() override;
 
     private:
-        std::shared_ptr<ExternalReference> model;
+        std::unique_ptr<ExternalReference> model;
         std::function<void(ExternalReference *)> callback;
     };
 }
diff --git a/sources/src/citygml/citygmlfactory.cpp b/sources/src/citygml/citygmlfactory.cpp
@@ -95,10 +95,9 @@ namespace citygml {
         return std::shared_ptr<LineString>(lineString);
     }
 
-    std::shared_ptr<ExternalReference> CityGMLFactory::createExternalReference(const std::string& id)
+    ExternalReference* CityGMLFactory::createExternalReference(const std::string& id)
     {
-        ExternalReference * externalReference = new ExternalReference(id);
-        return std::shared_ptr<ExternalReference>(externalReference);
+        return new ExternalReference(id);
     }
 
     void CityGMLFactory::requestSharedPolygonForGeometry(Geometry* geom, const std::string& polygonId)

diff --git a/sources/src/parser/externalreferenceparser.cpp b/sources/src/parser/externalreferenceparser.cpp
@@ -25,13 +25,13 @@ namespace citygml {
             CITYGML_LOG_ERROR(m_logger, "Expected start tag <" << NodeType::CORE_ExternalReferenceNode << "> but got <" << node.name() << "> at " << getDocumentLocation());
         }
 
-        model = m_factory.createExternalReference(attributes.getCityGMLIDAttribute());
+        model.reset(m_factory.createExternalReference(attributes.getCityGMLIDAttribute()));
 
         return true;
     }
 
     bool ExternalReferenceParser::parseElementEndTag(NodeType::XMLNode const& node, std::string const&) {
-        callback(model.get());
+        callback(model.release());
         return true;
     }