aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-11 03:01:20 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-11 03:01:20 +0200
commit9a389ca1cc21c97c44f1dc94757cf64cf82fa38f (patch)
tree2907e10f0329ac670e0787882c031c13dfea57d6
parentb04da6b3dbbc194ab06248380d9affca0a9f22a7 (diff)
parent06247911547af38320a080b8d3a82e4e90467073 (diff)
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
-rw-r--r--src/coap/qcoapinternalmessage.cpp3
-rw-r--r--src/coap/qcoapinternalreply.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/coap/qcoapinternalmessage.cpp b/src/coap/qcoapinternalmessage.cpp
index 271ab30..59f63ba 100644
--- a/src/coap/qcoapinternalmessage.cpp
+++ b/src/coap/qcoapinternalmessage.cpp
@@ -123,7 +123,8 @@ void QCoapInternalMessage::setFromDescriptiveBlockOption(const QCoapOption &opti
{
Q_D(QCoapInternalMessage);
- const quint8 *optionData = reinterpret_cast<const quint8 *>(option.opaqueValue().data());
+ const auto value = option.opaqueValue();
+ const quint8 *optionData = reinterpret_cast<const quint8 *>(value.data());
const quint8 lastByte = optionData[option.length() - 1];
quint32 blockNumber = 0;
diff --git a/src/coap/qcoapinternalreply.cpp b/src/coap/qcoapinternalreply.cpp
index 2480a05..b795046 100644
--- a/src/coap/qcoapinternalreply.cpp
+++ b/src/coap/qcoapinternalreply.cpp
@@ -188,7 +188,8 @@ int QCoapInternalReply::nextBlockToSend() const
if (!option.isValid())
return -1;
- const quint8 *optionData = reinterpret_cast<const quint8 *>(option.opaqueValue().data());
+ const auto value = option.opaqueValue();
+ const quint8 *optionData = reinterpret_cast<const quint8 *>(value.data());
const quint8 lastByte = optionData[option.length() - 1];
// M field