Bug 576447: ^ means bitwise-xor, nothing else. r=dbaron
authorJonas Sicking <jonas@sicking.cc>
Thu, 22 Jul 2010 18:16:02 -0700
changeset 48115 6f9698905efb790c6d9956e6432625fb3c14feb5
parent 48114 93c41e057f905611e52c7f212c43e320f748270b
child 48116 a4b7ad2f48544e3308cef59a126e2940e5089560
push id14577
push usersicking@mozilla.com
push dateFri, 23 Jul 2010 01:17:13 +0000
treeherdermozilla-central@6f9698905efb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs576447
milestone2.0b3pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 576447: ^ means bitwise-xor, nothing else. r=dbaron
content/html/content/src/nsHTMLFrameSetElement.cpp
--- 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];