Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert amqp mgmt string type check to avoid log error when description is null #235

Merged
merged 5 commits into from
Apr 29, 2021
Merged

revert amqp mgmt string type check to avoid log error when description is null #235

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
273ef51
revert amqp mgmt string type check to avoid log error when descriptio…
yunhaoling Apr 28, 2021
2233505
update changelog
yunhaoling Apr 28, 2021
d428c9a
more revert
yunhaoling Apr 28, 2021
4c34ba9
update changelog
yunhaoling Apr 28, 2021
376471b
add issue reference
yunhaoling Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Release History

This version and all future versions will require Python 2.7 or Python 3.6+, Python 3.5 is no longer supported.

- Improved management operation callback not to parse description value of non AMQP_TYPE_STRING type as string.
yunhaoling marked this conversation as resolved.
Show resolved Hide resolved

1.3.0 (2021-04-05)
+++++++++++++++++++

Expand Down
13 changes: 11 additions & 2 deletions src/vendor/azure-uamqp-c/src/amqp_management.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,17 @@ static AMQP_VALUE on_message_received(const void* context, MESSAGE_HANDLE messag
desc_value = amqpvalue_get_map_value(map, desc_key);
if (desc_value != NULL)
{
/* Codes_SRS_AMQP_MANAGEMENT_01_134: [ The status description value shall be extracted from the value found in the map by using `amqpvalue_get_string`. ]*/
if (amqpvalue_get_string(desc_value, &status_description) != 0)
AMQP_TYPE amqp_type = amqpvalue_get_type(desc_value);
if (amqp_type == AMQP_TYPE_STRING)
{
/* Codes_SRS_AMQP_MANAGEMENT_01_134: [ The status description value shall be extracted from the value found in the map by using `amqpvalue_get_string`. ]*/
if (amqpvalue_get_string(desc_value, &status_description) != 0)
{
/* Codes_SRS_AMQP_MANAGEMENT_01_125: [ If status description is not found, NULL shall be passed to the user callback as `status_description` argument. ]*/
status_description = NULL;
}
}
else
{
/* Codes_SRS_AMQP_MANAGEMENT_01_125: [ If status description is not found, NULL shall be passed to the user callback as `status_description` argument. ]*/
status_description = NULL;
Expand Down