From 72bbaccaa082a3ad6fff9bbc1cf70d01dabd79e8 Mon Sep 17 00:00:00 2001
From: "keybuk@google.com"
<keybuk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 21 Mar 2012 23:43:45 +0000
Subject: dbus: clear array values before reading from variant
PopArrayFromVariant() appends values to the existing value, rather
than clearing first like I expected, so using this without clear()
first means the property value accumulates all values and never
loses them.
BUG=none
TEST=unit test included
Change-Id: Ie392a89190f4ad8570a905f24b2f446e1f2bed81
R=satorux@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9809001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128108 0039d316-1c4b-4281-b951-d872f2087c98
---
dbus/property.cc | 2 ++
1 file changed, 2 insertions(+)
(limited to 'dbus/property.cc')
diff --git a/dbus/property.cc b/dbus/property.cc
index 0d6e7f0..0abe001 100644
--- a/dbus/property.cc
+++ b/dbus/property.cc
@@ -382,6 +382,7 @@ bool Property<std::vector<std::string> >::PopValueFromReader(
if (!reader->PopVariant(&variant_reader))
return false;
+ value_.clear();
return variant_reader.PopArrayOfStrings(&value_);
}
@@ -406,6 +407,7 @@ bool Property<std::vector<ObjectPath> >::PopValueFromReader(
if (!reader->PopVariant(&variant_reader))
return false;
+ value_.clear();
return variant_reader.PopArrayOfObjectPaths(&value_);
}
--
cgit v1.1