Merge fix for 1362175 to Beta branch.

chrome/common/gfx/url_elider.cc

 // Copyright 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
@@ skipping 176 matching lines @@
                                                       size());
   std::wstring url_filename;
   if ((url_path_elements.at(url_path_number_of_elements - 1)).length() > 0) {
     url_filename = *(url_path_elements.end()-1);
   } else if (url_path_number_of_elements > 1) {  // Path ends with a '/'.
     url_filename = url_path_elements.at(url_path_number_of_elements - 2) +
         L"/";
     url_path_number_of_elements--;
   }
 
+  const int kMaxNumberOfUrlPathElementsAllowed = 1024;
+  if (url_path_number_of_elements <= 1 || 
+      url_path_number_of_elements > kMaxNumberOfUrlPathElementsAllowed) {
+    // No path to elide, or too long of a path (could overflow in loop below) 
+    // Just elide this as a text string.
+    return ElideText(url_subdomain + url_domain + url_path_query_etc, font,
+                     available_pixel_width);
+  }
+
   // Start eliding the path and replacing elements by "../".
   std::wstring an_ellipsis_and_a_slash(kEllipsis);
   an_ellipsis_and_a_slash += '/';
   int pixel_width_url_filename = font.GetStringWidth(url_filename);
   int pixel_width_dot_dot_slash = font.GetStringWidth(an_ellipsis_and_a_slash);
   int pixel_width_slash = font.GetStringWidth(L"/");
-  int pixel_width_url_path_elements[256]; // Declared static for speed.
+  int pixel_width_url_path_elements[kMaxNumberOfUrlPathElementsAllowed];
   for (int i = 0; i < url_path_number_of_elements; i++) {
     pixel_width_url_path_elements[i] =
        font.GetStringWidth(url_path_elements.at(i));
   }
 
-  if (url_path_number_of_elements <= 1) {
-    // Nothing FITS - return domain and rest.
-    return ElideText(url_subdomain + url_domain + url_path_query_etc, font,
-                     available_pixel_width);
-  }
-
   // Check with both subdomain and domain.
   std::wstring elided_path;
   int pixel_width_elided_path;
   for (int i = url_path_number_of_elements - 1; i >= 1; i--) {
     // Add the initial elements of the path.
     elided_path.clear();
     pixel_width_elided_path = 0;
     for (int j = 0; j < i; j++) {
       elided_path += url_path_elements.at(j) + L"/";
       pixel_width_elided_path += pixel_width_url_path_elements[j] +
@@ skipping 201 matching lines @@
     url_string.push_back('#');
     if (parsed.ref.len > 0)
       url_string.append(UTF8ToWide(std::string(&spec[parsed.ref.begin],
                                                parsed.ref.len)));
   }
 
   return url_string;
 }
 
 } // namespace gfx.