qiurui
/
qtgrpc
mirror of https://github.com/qt/qtgrpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Require the 'scope' descriptor in produceProperyMap functions 

The scope is mandatory there, since we read the containing class
name from it. Assert if the scope is nullptr.

Coverity-Id: 479426
Pick-to: 6.8 6.9
Change-Id: Iad3acba25083fde89b70b9c6dcacd4e2cafc3cae
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
This commit is contained in:
Alexey Edelev 2025-03-31 21:07:52 +02:00
parent cc5f89d5a4
commit 08e170bec9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/qtprotoccommon/generatorcommon.cpp
View File

@ -524,12 +524,13 @@ TypeMap common::produceTypeMap(const FieldDescriptor *field, const Descriptor *s
PropertyMap common::producePropertyMap(const OneofDescriptor *oneof, const Descriptor *scope)
{
assert(oneof != nullptr);
assert(scope != nullptr);
PropertyMap propertyMap;
propertyMap["optional_property_name"] = qualifiedCppName(qualifiedQmlName(oneof->name()));
propertyMap["optional_property_name_cap"] = utils::capitalizeAsciiName(oneof->name());
auto scopeTypeMap = produceMessageTypeMap(scope, nullptr);
propertyMap["classname"] = scope != nullptr ? scopeTypeMap["classname"] : "";
propertyMap["classname"] = scopeTypeMap["classname"];
propertyMap["dataclassname"] = propertyMap["classname"] + CommonTemplates::DataClassName();
propertyMap["type"] = propertyMap["optional_property_name_cap"] + "Fields";
propertyMap["export_macro"] = common::buildExportMacro();
@ -540,6 +541,7 @@ PropertyMap common::producePropertyMap(const OneofDescriptor *oneof, const Descr
PropertyMap common::producePropertyMap(const FieldDescriptor *field, const Descriptor *scope)
{
assert(field != nullptr);
assert(scope != nullptr);
PropertyMap propertyMap = produceTypeMap(field, scope);
@ -567,7 +569,7 @@ PropertyMap common::producePropertyMap(const FieldDescriptor *field, const Descr
auto scopeTypeMap = produceMessageTypeMap(scope, nullptr);
propertyMap["key_type"] = "";
propertyMap["value_type"] = "";
propertyMap["classname"] = scope != nullptr ? scopeTypeMap["classname"] : "";
propertyMap["classname"] = scopeTypeMap["classname"];
propertyMap["dataclassname"] = propertyMap["classname"] + CommonTemplates::DataClassName();
propertyMap["number"] = std::to_string(field->number());