mozilla-central: changeset 48115:6f9698905efb790c6d9956e6432625fb3c14feb5

author	Jonas Sicking <jonas@sicking.cc>
	Thu, 22 Jul 2010 18:16:02 -0700
changeset 48115	6f9698905efb790c6d9956e6432625fb3c14feb5
parent 48114	93c41e057f905611e52c7f212c43e320f748270b
child 48116	a4b7ad2f48544e3308cef59a126e2940e5089560
push id	14577
push user	sicking@mozilla.com
push date	Fri, 23 Jul 2010 01:17:13 +0000
treeherder	mozilla-central@6f9698905efb [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	dbaron
bugs	576447
milestone	2.0b3pre
first release with	nightly linux32 58101a16aff7 / 4.0b3pre / 20100723031340 / files nightly linux64 58101a16aff7 / 4.0b3pre / 20100723030902 / files nightly mac 58101a16aff7 / 4.0b3pre / 20100723031249 / files nightly win32 58101a16aff7 / 4.0b3pre / 20100723040900 / files nightly win64 bcae411bc333 / 4.0b3pre / 20100723063738 / files
last release without	nightly linux32 dfaba4e449bd / 4.0b3pre / 20100722073124 / files nightly linux64 dfaba4e449bd / 4.0b3pre / 20100722074045 / files nightly mac dfaba4e449bd / 4.0b3pre / 20100722074316 / files nightly win32 dfaba4e449bd / 4.0b3pre / 20100722083711 / files nightly win64 9805493631d4 / 4.0b3pre / 20100722045421 / files

--- a/content/html/content/src/nsHTMLFrameSetElement.cpp
+++ b/content/html/content/src/nsHTMLFrameSetElement.cpp
@@ -319,17 +319,17 @@ nsHTMLFrameSetElement::ParseRowCol(const
   nsAutoString spec(aValue);
   // remove whitespace (Bug 33699) and quotation marks (bug 224598)
   // also remove leading/trailing commas (bug 31482)
   spec.StripChars(" \n\r\t\"\'");
   spec.Trim(",");
   
 #define MAX_FRAMESET_SPEC_COUNT 100000
   // Count the commas. Don't count more than X commas (bug 576447).
-  PR_STATIC_ASSERT(MAX_FRAMESET_SPEC_COUNT * sizeof(nsFramesetSpec) < 2^30);
+  PR_STATIC_ASSERT(MAX_FRAMESET_SPEC_COUNT * sizeof(nsFramesetSpec) < (1 << 30));
   PRInt32 commaX = spec.FindChar(sComma);
   PRInt32 count = 1;
   while (commaX != kNotFound && count < MAX_FRAMESET_SPEC_COUNT) {
     count++;
     commaX = spec.FindChar(sComma, commaX + 1);
   }
 
   nsFramesetSpec* specs = new nsFramesetSpec[count];