Merge 79851 - XDG isn't thread safe. Add a lock around calls to it.

base/mime_util_xdg.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/mime_util.h"
 
 #include <gtk/gtk.h>
 #include <sys/time.h>
 #include <time.h>
 
 #include <cstdlib>
 #include <list>
 #include <map>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
+#include "base/synchronization/lock.h"
 #include "base/third_party/xdg_mime/xdgmime.h"
 #include "base/threading/thread_restrictions.h"
 
 namespace {
 
+// None of the XDG stuff is thread-safe, so serialize all accesss under
+// this lock.
+base::Lock g_mime_util_xdg_lock;
+
 class IconTheme;
 
 class MimeUtilConstants {
  public:
   static MimeUtilConstants* GetInstance() {
     return Singleton<MimeUtilConstants>::get();
   }
 
   // In seconds, specified by icon theme specs.
   const int kUpdateInterval;
@@ skipping 508 matching lines @@
   for (size_t i = 0; i < kDefaultThemeNum; i++)
     delete default_themes_[i];
 }
 
 }  // namespace
 
 namespace mime_util {
 
 std::string GetFileMimeType(const FilePath& filepath) {
   base::ThreadRestrictions::AssertIOAllowed();
+  base::AutoLock scoped_lock(g_mime_util_xdg_lock);
   return xdg_mime_get_mime_type_from_file_name(filepath.value().c_str());
 }
 
 std::string GetDataMimeType(const std::string& data) {
   base::ThreadRestrictions::AssertIOAllowed();
+  base::AutoLock scoped_lock(g_mime_util_xdg_lock);
   return xdg_mime_get_mime_type_for_data(data.data(), data.length(), NULL);
 }
 
 void DetectGtkTheme() {
   // If the theme name is already loaded, do nothing. Chrome doesn't respond
   // to changes in the system theme, so we never need to set this more than
   // once.
   if (!MimeUtilConstants::GetInstance()->gtk_theme_name_.empty())
     return;
 
   // We should only be called on the UI thread.
   DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
 
   gchar* gtk_theme_name;
   g_object_get(gtk_settings_get_default(),
                "gtk-icon-theme-name",
                &gtk_theme_name, NULL);
   MimeUtilConstants::GetInstance()->gtk_theme_name_.assign(gtk_theme_name);
   g_free(gtk_theme_name);
 }
 
 FilePath GetMimeIcon(const std::string& mime_type, size_t size) {
   base::ThreadRestrictions::AssertIOAllowed();
   std::vector<std::string> icon_names;
   std::string icon_name;
   FilePath icon_file;
 
-  const char* icon = xdg_mime_get_icon(mime_type.c_str());
-  icon_name = std::string(icon ? icon : "");
+  {
+    base::AutoLock scoped_lock(g_mime_util_xdg_lock);
+    const char *icon = xdg_mime_get_icon(mime_type.c_str());
+    icon_name = std::string(icon ? icon : "");
+  }
+
   if (icon_name.length())
     icon_names.push_back(icon_name);
 
   // For text/plain, try text-plain.
   icon_name = mime_type;
   for (size_t i = icon_name.find('/', 0); i != std::string::npos;
        i = icon_name.find('/', i + 1)) {
     icon_name[i] = '-';
   }
   icon_names.push_back(icon_name);
@@ skipping 19 matching lines @@
     } else {
       icon_file = LookupIconInDefaultTheme(icon_names[i], size);
       if (!icon_file.empty())
         return icon_file;
     }
   }
   return FilePath();
 }
 
 }  // namespace mime_util