From fdf64eb1e9b79932cf76e3a22126ac912f9d9dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christophe=20Gu=C3=A9bert?= Date: Wed, 19 Oct 2016 14:59:14 +0200 Subject: [PATCH] Use class member initializers to fix a bug in AssociationParameters where some members could have garbage values. --- src/odil/AssociationParameters.cpp | 6 ------ src/odil/AssociationParameters.h | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/odil/AssociationParameters.cpp b/src/odil/AssociationParameters.cpp index 6d9d6056..1fa54080 100644 --- a/src/odil/AssociationParameters.cpp +++ b/src/odil/AssociationParameters.cpp @@ -104,18 +104,12 @@ ::operator==(UserIdentity const & other) const AssociationParameters ::AssociationParameters() -: _called_ae_title(""), _calling_ae_title(""), _presentation_contexts(), - _user_identity({UserIdentity::Type::None, "", ""}), _maximum_length(16384), - _maximum_number_operations_invoked(1), _maximum_number_operations_performed(1), - _sop_class_extended_negotiation(), _sop_class_common_extended_negotiation() { // Nothing else. } AssociationParameters ::AssociationParameters(pdu::AAssociateRQ const & pdu) -: _called_ae_title(""), _calling_ae_title(""), _presentation_contexts(), - _user_identity(), _maximum_length(16384) { this->set_called_ae_title(pdu.get_called_ae_title()); this->set_calling_ae_title(pdu.get_calling_ae_title()); diff --git a/src/odil/AssociationParameters.h b/src/odil/AssociationParameters.h index d11d5825..5e0fde51 100644 --- a/src/odil/AssociationParameters.h +++ b/src/odil/AssociationParameters.h @@ -227,9 +227,9 @@ class AssociationParameters std::string _calling_ae_title; std::vector _presentation_contexts; UserIdentity _user_identity; - uint32_t _maximum_length; - uint16_t _maximum_number_operations_invoked; - uint16_t _maximum_number_operations_performed; + uint32_t _maximum_length = 16384; + uint16_t _maximum_number_operations_invoked = 1; + uint16_t _maximum_number_operations_performed = 1; std::vector _sop_class_extended_negotiation; std::vector