[qt5cpp] Add nullptr guard to prevent crash when empty model is being…

… serialized (#7434) * Small fixes to prevent crash when empty json body is provided. * Updated PetStore example for Qt5
OpenAPITools · Jan 19, 2018 · ea4b948 · ea4b948
1 parent 30c1448
commit ea4b948
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-header.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-header.mustache
@@ -3,6 +3,8 @@
 #define {{prefix}}_HELPERS_H
 
 #include <QJsonValue>
+#include <QList>
+#include <QMap>
 
 {{#cppNamespaceDeclarations}}
 namespace {{this}} {

diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache
@@ -105,7 +105,7 @@ QJsonObject*
     QJsonObject* obj = new QJsonObject();
     {{#vars}}
     {{^isContainer}}{{#complexType}}{{^isString}}{{^isDate}}{{^isDateTime}}{{^isByteArray}} 
-    if({{name}}->isSet()){
+    if(({{name}} != nullptr) && ({{name}}->isSet())){
         toJsonValue(QString("{{baseName}}"), {{name}}, obj, QString("{{complexType}}"));
     }{{/isByteArray}}{{/isDateTime}}{{/isDate}}{{/isString}}{{#isString}}
     if({{name}} != nullptr && *{{name}} != QString("")){

diff --git a/samples/client/petstore/qt5cpp/client/SWGHelpers.h b/samples/client/petstore/qt5cpp/client/SWGHelpers.h
@@ -14,6 +14,8 @@
 #define SWG_HELPERS_H
 
 #include <QJsonValue>
+#include <QList>
+#include <QMap>
 
 namespace Swagger {
 

diff --git a/samples/client/petstore/qt5cpp/client/SWGPet.cpp b/samples/client/petstore/qt5cpp/client/SWGPet.cpp
@@ -122,7 +122,7 @@ SWGPet::asJsonObject() {
         obj->insert("id", QJsonValue(id));
     }
 
-    if(category->isSet()){
+    if((category != nullptr) && (category->isSet())){
         toJsonValue(QString("category"), category, obj, QString("SWGCategory"));
     }