Qt5cpp plug memleaks part2 (#7792)

* Small fixes to prevent crash when empty json body is provided. * Fix some more memory Leaks in the model-body - Members not deleted in cleanup() method, for maps/arrays of primitive types. - Avoid undefined behavior when updating class members with data from missing json fields
OpenAPITools · Mar 8, 2018 · 1947220 · 1947220
1 parent f00a1ef
commit 1947220
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache
@@ -14,7 +14,7 @@ namespace {{this}} {
 
 void
 setValue(void* value, QJsonValue obj, QString type, QString complexType) {
-    if(value == nullptr) {
+    if((value == nullptr) || (obj.isUndefined())) {
         // can't set value with a null pointer
         return;
     }

diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache
@@ -47,7 +47,14 @@ void
             delete o;
         }{{/isContainer}}
         delete {{name}};
-    }{{/complexType}}
+    }{{/complexType}}{{^complexType}}{{#isContainer}}
+    if({{name}} != nullptr) { {{#items.isContainer}}
+        auto arr = {{name}};
+        for(auto o: *arr) { 
+            delete o;
+        }{{/items.isContainer}}
+        delete {{name}};
+    }{{/isContainer}}{{/complexType}}
     {{/vars}}
 }
 

diff --git a/samples/client/petstore/qt5cpp/client/SWGHelpers.cpp b/samples/client/petstore/qt5cpp/client/SWGHelpers.cpp
@@ -23,7 +23,7 @@ namespace Swagger {
 
 void
 setValue(void* value, QJsonValue obj, QString type, QString complexType) {
-    if(value == nullptr) {
+    if((value == nullptr) || (obj.isUndefined())) {
         // can't set value with a null pointer
         return;
     }

diff --git a/samples/client/petstore/qt5cpp/client/SWGHelpers.h b/samples/client/petstore/qt5cpp/client/SWGHelpers.h
@@ -13,6 +13,7 @@
 #ifndef SWG_HELPERS_H
 #define SWG_HELPERS_H
 
+#include <QJsonObject>
 #include <QJsonValue>
 #include <QList>
 #include <QMap>

diff --git a/samples/client/petstore/qt5cpp/client/SWGModelFactory.h b/samples/client/petstore/qt5cpp/client/SWGModelFactory.h
@@ -13,6 +13,7 @@
 #ifndef ModelFactory_H_
 #define ModelFactory_H_
 
+#include "SWGObject.h"
 
 #include "SWGApiResponse.h"
 #include "SWGCategory.h"

diff --git a/samples/client/petstore/qt5cpp/client/SWGObject.h b/samples/client/petstore/qt5cpp/client/SWGObject.h
@@ -13,7 +13,7 @@
 #ifndef _SWG_OBJECT_H_
 #define _SWG_OBJECT_H_
 
-#include <QJsonValue>
+#include <QJsonObject>
 
 namespace Swagger {