Skip to content

Commit 8a4a274

Browse files
committed
fix null client option
1 parent 0dd231e commit 8a4a274

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

source/v5/mqtt5_options_storage.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ int aws_mqtt5_packet_connect_storage_init(
701701
AWS_ZERO_STRUCT(metrics_username_buf);
702702

703703
/* Apply metrics to username if configured */
704-
if (client_config->metrics != NULL) {
704+
if (client_config && client_config->metrics != NULL) {
705705
struct aws_byte_cursor username_cur = storage->username;
706706
if (aws_mqtt_append_sdk_metrics_to_username(
707707
allocator, &username_cur, *client_config->metrics, &metrics_username_buf, NULL)) {
@@ -4025,9 +4025,12 @@ struct aws_mqtt5_client_options_storage *aws_mqtt5_client_options_storage_new(
40254025
}
40264026
options_view->host_resolution_override = &options_storage->host_resolution_override;
40274027

4028-
// TODO: Placehold for metrics storage implemnetation.
40294028
options_storage->metrics_storage = aws_mqtt_iot_sdk_metrics_storage_new(allocator, options->metrics);
4030-
options_view->metrics = &options_storage->metrics_storage->storage_view;
4029+
if (options_storage->metrics_storage) {
4030+
options_view->metrics = &options_storage->metrics_storage->storage_view;
4031+
} else {
4032+
options_view->metrics = NULL;
4033+
}
40314034

40324035
return options_storage;
40334036

0 commit comments

Comments
 (0)