summaryrefslogtreecommitdiffstats
path: root/device/media_transfer_protocol
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-24 15:59:40 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-24 15:59:40 +0000
commit38715910ea552ad5198b6dba8bca3a57f46c1e9a (patch)
tree6f24b031d0261aa086892229cbd6a5cd8cb23668 /device/media_transfer_protocol
parent1d82a58776d3b5233028bdc7f59c52a21a835177 (diff)
downloadchromium_src-38715910ea552ad5198b6dba8bca3a57f46c1e9a.zip
chromium_src-38715910ea552ad5198b6dba8bca3a57f46c1e9a.tar.gz
chromium_src-38715910ea552ad5198b6dba8bca3a57f46c1e9a.tar.bz2
chromeos: Make dbus::MessageReader memory ownership explicit
Make memory returned by MessageReader::PopArrayOfBytes() const to make it clearer that ownership remains with the MessageReader. Also update PopArrayOfStrings() and PopArrayOfObjectPaths() to clear the passed-in vectors before appending to them. BUG=none TBR=isherman@chromium.org,mvanouwerkerk@chromium.org Review URL: https://codereview.chromium.org/176693003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/media_transfer_protocol')
-rw-r--r--device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc b/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc
index 41ac37e..5df7ef0 100644
--- a/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc
+++ b/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc
@@ -349,7 +349,7 @@ class MediaTransferProtocolDaemonClientImpl
return;
}
- uint8* data_bytes = NULL;
+ const uint8* data_bytes = NULL;
size_t data_length = 0;
dbus::MessageReader reader(response);
if (!reader.PopArrayOfBytes(&data_bytes, &data_length)) {