Add size checks to extension icons to prevent out of memory conditions

chrome/browser/ui/webui/favicon_source.cc

Index: chrome/browser/ui/webui/favicon_source.cc
===================================================================
--- chrome/browser/ui/webui/favicon_source.cc	(revision 173105)
+++ chrome/browser/ui/webui/favicon_source.cc	(working copy)
@@ -82,8 +82,10 @@
       size_t scale_delimiter = path.find("@", 5);
       std::string size = path.substr(5, slash - 5);
       size_in_dip = atoi(size.c_str());
-      DCHECK(size_in_dip == 64 || size_in_dip == 32 || size_in_dip == 16) <<
-          "only 64x64, 32x32 and 16x16 icons are supported";
+      if (size_in_dip != 64 && size_in_dip != 32 && size_in_dip != 16) {
+        // Only 64x64, 32x32 and 16x16 icons are supported
+        size_in_dip = 16;

[Mustafa Acer, 2012/12/14 19:29:25]

I'm hoping this won't break any case where a size 48 or any other nonstandard
favicon may be used somewhere in the ui.

[Matt Perry, 2012/12/14 19:33:44]

If we used sizes like that anywhere, we should have been hitting this DCHECK.
Since no one has noticed, I'm guessing we don't.

+      }
       // Optional scale factor.
       if (scale_delimiter != std::string::npos && scale_delimiter < slash) {
         DCHECK(size_in_dip == 16);