summaryrefslogtreecommitdiffstats
path: root/jingle/glue
diff options
context:
space:
mode:
Diffstat (limited to 'jingle/glue')
-rw-r--r--jingle/glue/thread_wrapper_unittest.cc2
-rw-r--r--jingle/glue/utils.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/jingle/glue/thread_wrapper_unittest.cc b/jingle/glue/thread_wrapper_unittest.cc
index 8230297..3657780 100644
--- a/jingle/glue/thread_wrapper_unittest.cc
+++ b/jingle/glue/thread_wrapper_unittest.cc
@@ -298,7 +298,7 @@ TEST_F(ThreadWrapperTest, SendDuringSend) {
}
TEST_F(ThreadWrapperTest, Dispose) {
- bool deleted_;
+ bool deleted_ = false;
thread_->Dispose(new DeletableObject(&deleted_));
EXPECT_FALSE(deleted_);
message_loop_.RunUntilIdle();
diff --git a/jingle/glue/utils.cc b/jingle/glue/utils.cc
index bc548ea..5350631 100644
--- a/jingle/glue/utils.cc
+++ b/jingle/glue/utils.cc
@@ -62,13 +62,13 @@ bool DeserializeP2PCandidate(const std::string& candidate_str,
static_cast<base::DictionaryValue*>(value.get());
std::string ip;
- int port;
+ int port = 0;
std::string type;
std::string protocol;
std::string username;
std::string password;
- double preference;
- int generation;
+ double preference = 0;
+ int generation = 0;
if (!dic_value->GetString("ip", &ip) ||
!dic_value->GetInteger("port", &port) ||