summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--base/linux_util.cc2
-rw-r--r--net/base/net_util.cc2
3 files changed, 3 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 7c7d863..e6f829c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -264,3 +264,4 @@ Teodora Novkovic <teodora.petrovic@gmail.com>
Joseph Gentle <josephg@gmail.com>
Paul Lind <paul.lind@imgtec.com>
Chaobin Zhang <zhchbin@gmail.com>
+Code Aurora Forum <*@codeaurora.org>
diff --git a/base/linux_util.cc b/base/linux_util.cc
index 660ea19..84f2028 100644
--- a/base/linux_util.cc
+++ b/base/linux_util.cc
@@ -231,7 +231,7 @@ bool FindProcessHoldingSocket(pid_t* pid_out, ino_t socket_inode) {
continue;
}
- ino_t fd_inode;
+ ino_t fd_inode = static_cast<ino_t>(-1);
if (ProcPathGetInode(&fd_inode, buf)) {
if (fd_inode == socket_inode) {
if (already_found) {
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index c5f5673..bf7fbb8 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -267,7 +267,7 @@ bool IsComponentCoveredByLang(const icu::UnicodeSet& component_characters,
const std::string& lang) {
CR_DEFINE_STATIC_LOCAL(
const icu::UnicodeSet, kASCIILetters, ('a', 'z'));
- icu::UnicodeSet* lang_set;
+ icu::UnicodeSet* lang_set = NULL;
// We're called from both the UI thread and the history thread.
{
base::AutoLock lock(g_lang_set_lock.Get());