encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-25 14:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

dawn_wire: Only generate has_member for optional members

Browse Source 
We were generating has_member for all pointer members which meant
it was possible to incorrectly pass nullptr for required arguments.

Bug: chromium:1009166
Change-Id: I5e32bab5ccae010468e55897ae9840ab8fda684f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/11760
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Austin Eng 2019-10-02 06:35:08 +00:00 committed by Commit Bot service account
parent dc9f1e6806
commit 4379e8f34f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
generator/templates/dawn_wire/WireCmd.cpp
View File

@ -106,7 +106,7 @@
size_t {{as_varName(member.name)}}Strlen; size_t {{as_varName(member.name)}}Strlen;
{% endfor %} {% endfor %}
{% for member in members if member.annotation != "value" and member.type.category != "object" %} {% for member in members if member.optional and member.annotation != "value" and member.type.category != "object" %}
bool has_{{as_varName(member.name)}}; bool has_{{as_varName(member.name)}};
{% endfor %} {% endfor %}
}; };
@ -187,9 +187,9 @@
{% for member in members if member.length == "strlen" %} {% for member in members if member.length == "strlen" %}
{% set memberName = as_varName(member.name) %} {% set memberName = as_varName(member.name) %}
bool has_{{memberName}} = record.{{memberName}} != nullptr;
transfer->has_{{memberName}} = has_{{memberName}};
{% if member.optional %} {% if member.optional %}
bool has_{{memberName}} = record.{{memberName}} != nullptr;
transfer->has_{{memberName}} = has_{{memberName}};
if (has_{{memberName}}) if (has_{{memberName}})
{% endif %} {% endif %}
{ {
@ -257,8 +257,10 @@
{% for member in members if member.length == "strlen" %} {% for member in members if member.length == "strlen" %}
{% set memberName = as_varName(member.name) %} {% set memberName = as_varName(member.name) %}
bool has_{{memberName}} = transfer->has_{{memberName}}; record->{{memberName}} = nullptr;
if (has_{{memberName}}) {% if member.optional %}
if (transfer->has_{{memberName}})
{% endif %}
{ {
size_t stringLength = transfer->{{memberName}}Strlen; size_t stringLength = transfer->{{memberName}}Strlen;
const char* stringInBuffer = nullptr; const char* stringInBuffer = nullptr;
@ -269,8 +271,6 @@
memcpy(copiedString, stringInBuffer, stringLength); memcpy(copiedString, stringInBuffer, stringLength);
copiedString[stringLength] = '\0'; copiedString[stringLength] = '\0';
record->{{memberName}} = copiedString; record->{{memberName}} = copiedString;
} else {
record->{{memberName}} = nullptr;
} }
{% endfor %} {% endfor %}