Fix some minor static buffer overruns detected by Coverity tool, and sync two versions of catttable.h. b=287290 r+sr=brendan

extensions/transformiix/source/xslt/txXSLTNumberCounters.cpp

@@ -1,246 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Jonas Sicking.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Jonas Sicking <sicking@bigfoot.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txXSLTNumber.h"
-#include "nsReadableUtils.h"
-#include "txCore.h"
-
-class txDecimalCounter : public txFormattedCounter {
-public:
-    txDecimalCounter() : mMinLength(1), mGroupSize(50)
-    {
-    }
-    
-    txDecimalCounter(PRInt32 aMinLength, PRInt32 aGroupSize,
-                     const nsAString& mGroupSeparator);
-    
-    virtual void appendNumber(PRInt32 aNumber, nsAString& aDest);
-
-private:
-    PRInt32 mMinLength;
-    PRInt32 mGroupSize;
-    nsString mGroupSeparator;
-};
-
-class txAlphaCounter : public txFormattedCounter {
-public:
-    txAlphaCounter(PRUnichar aOffset) : mOffset(aOffset)
-    {
-    }
-
-    virtual void appendNumber(PRInt32 aNumber, nsAString& aDest);
-    
-private:
-    PRUnichar mOffset;
-};
-
-class txRomanCounter : public txFormattedCounter {
-public:
-    txRomanCounter(MBool aUpper) : mTableOffset(aUpper ? 30 : 0)
-    {
-    }
-
-    void appendNumber(PRInt32 aNumber, nsAString& aDest);
-
-private:
-    PRInt32 mTableOffset;
-};
-
-
-nsresult
-txFormattedCounter::getCounterFor(const nsAFlatString& aToken,
-                                  PRInt32 aGroupSize,
-                                  const nsAString& aGroupSeparator,
-                                  txFormattedCounter*& aCounter)
-{
-    PRInt32 length = aToken.Length();
-    NS_ASSERTION(length, "getting counter for empty token");
-    aCounter = 0;
-    
-    if (length == 1) {
-        PRUnichar ch = aToken.CharAt(0);
-        switch (ch) {
-
-            case 'i':
-            case 'I':
-                aCounter = new txRomanCounter(ch == 'I');
-                break;
-            
-            case 'a':
-            case 'A':
-                aCounter = new txAlphaCounter(ch);
-                break;
-            
-            case '1':
-            default:
-                // if we don't recognize the token then use "1"
-                aCounter = new txDecimalCounter(1, aGroupSize,
-                                                aGroupSeparator);
-                break;
-        }
-        return aCounter ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-    }
-    
-    // for now, the only multi-char token we support are decimals
-    PRInt32 i;
-    for (i = 0; i < length-1; ++i) {
-        if (aToken.CharAt(i) != '0')
-            break;
-    }
-    if (i == length-1 && aToken.CharAt(i) == '1') {
-        aCounter = new txDecimalCounter(length, aGroupSize, aGroupSeparator);
-    }
-    else {
-        // if we don't recognize the token then use '1'
-        aCounter = new txDecimalCounter(1, aGroupSize, aGroupSeparator);
-    }
-
-    return aCounter ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-
-txDecimalCounter::txDecimalCounter(PRInt32 aMinLength, PRInt32 aGroupSize,
-                                   const nsAString& aGroupSeparator)
-    : mMinLength(aMinLength), mGroupSize(aGroupSize),
-      mGroupSeparator(aGroupSeparator)
-{
-    if (mGroupSize <= 0) {
-        mGroupSize = aMinLength + 10;
-    }
-}
-
-void txDecimalCounter::appendNumber(PRInt32 aNumber, nsAString& aDest)
-{
-    const PRInt32 bufsize = 10; //must be able to fit an PRInt32
-    PRUnichar buf[bufsize];
-    PRInt32 pos = bufsize;
-    while (aNumber > 0) {
-        PRInt32 ch = aNumber % 10;
-        aNumber /= 10;
-        buf[--pos] = ch + '0';
-    }
-
-    // in case we didn't get a long enough string
-    PRInt32 end  = (bufsize > mMinLength) ? bufsize - mMinLength : 0;
-    while (pos > end) {
-        buf[--pos] = '0';
-    }
-    
-    // in case we *still* didn't get a long enough string.
-    // this should be very rare since it only happens if mMinLength is bigger
-    // then the length of any PRInt32.
-    // pos will always be zero 
-    PRInt32 extraPos = mMinLength;
-    while (extraPos > bufsize) {
-        aDest.Append(PRUnichar('0'));
-        --extraPos;
-        if (extraPos % mGroupSize == 0) {
-            aDest.Append(mGroupSeparator);
-        }
-    }
-
-    // copy string to buffer
-    if (mGroupSize >= bufsize - pos) {
-        // no grouping will occur
-        aDest.Append(buf + pos, (PRUint32)(bufsize - pos));
-    }
-    else {
-        // append chars up to first grouping separator
-        PRInt32 len = ((bufsize - pos - 1) % mGroupSize) + 1;
-        aDest.Append(buf + pos, len);
-        pos += len;
-        while (bufsize - pos > 0) {
-            aDest.Append(mGroupSeparator);
-            aDest.Append(buf + pos, mGroupSize);
-            pos += mGroupSize;
-        }
-        NS_ASSERTION(bufsize == pos, "error while grouping");
-    }
-}
-
-
-void txAlphaCounter::appendNumber(PRInt32 aNumber, nsAString& aDest)
-{
-    PRUnichar buf[11];
-    buf[11] = 0;
-    PRInt32 pos = 11;
-    while (aNumber > 0) {
-        --aNumber;
-        PRInt32 ch = aNumber % 26;
-        aNumber /= 26;
-        buf[--pos] = ch + mOffset;
-    }
-    
-    aDest.Append(buf + pos, (PRUint32)(11 - pos));
-}
-
-
-const char* const kTxRomanNumbers[] =
-    {"", "c", "cc", "ccc", "cd", "d", "dc", "dcc", "dccc", "cm",
-     "", "x", "xx", "xxx", "xl", "l", "lx", "lxx", "lxxx", "xc",
-     "", "i", "ii", "iii", "iv", "v", "vi", "vii", "viii", "ix",
-     "", "C", "CC", "CCC", "CD", "D", "DC", "DCC", "DCCC", "CM",
-     "", "X", "XX", "XXX", "XL", "L", "LX", "LXX", "LXXX", "XC",
-     "", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX"};
-
-void txRomanCounter::appendNumber(PRInt32 aNumber, nsAString& aDest)
-{
-    // Numbers bigger then 3999 can't be done in roman
-    if (aNumber >= 4000) {
-        txDecimalCounter().appendNumber(aNumber, aDest);
-        return;
-    }
-
-    while (aNumber >= 1000) {
-        aDest.Append(!mTableOffset ? PRUnichar('m') : PRUnichar('M'));
-        aNumber -= 1000;
-    }
-
-    PRInt32 posValue;
-    
-    // Hundreds
-    posValue = aNumber / 100;
-    aNumber %= 100;
-    AppendASCIItoUTF16(kTxRomanNumbers[posValue + mTableOffset], aDest);
-    // Tens
-    posValue = aNumber / 10;
-    aNumber %= 10;
-    AppendASCIItoUTF16(kTxRomanNumbers[10 + posValue + mTableOffset], aDest);
-    // Ones
-    AppendASCIItoUTF16(kTxRomanNumbers[20 + aNumber + mTableOffset], aDest);
-}

gfx/src/ps/nsAFMObject.cpp

@@ -653,11 +653,11 @@ PRInt32 i, ch;
   ungetc (ch, mAFMFile);
 
   // Read to the end of the line. 
-  for (i = 0, ch = getc (mAFMFile);((PRUint32)i) < sizeof (mToken) && ch != EOF && ch != '\n';i++, ch = getc (mAFMFile)){
+  for (i = 0, ch = getc (mAFMFile);((PRUint32)i) < sizeof (mToken) - 1 && ch != EOF && ch != '\n';i++, ch = getc (mAFMFile)){
     mToken[i] = ch;
   }
 
-  if (((PRUint32)i) >= sizeof (mToken)){
+  if (((PRUint32)i) >= sizeof (mToken) - 1){
     //parse_error (handle, AFM_ERROR_SYNTAX);
   }
 

intl/unicharutil/src/cattable.h

@@ -22,8 +22,8 @@
  * Contributor(s):
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
@@ -1451,31 +1451,31 @@ static PRUint8 GetCat(PRUnichar u)
     //
     // Handle U+0000 to U+06FF
     if( (u<=((PRUnichar)0x06FF))) {
-        pat = gGenCatPat[gGenCatIdx1 [( u -(PRUnichar) 0x0000 )]];
+        pat = gGenCatPat[gGenCatIdx1 [( u -(PRUnichar) 0x0000 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+0900 to U+11FF
     if((((PRUnichar)0x0900)<=u)&&(u<=((PRUnichar)0x11FF))) {
-        pat = gGenCatPat[gGenCatIdx2 [( u -(PRUnichar) 0x0900 )]];
+        pat = gGenCatPat[gGenCatIdx2 [( u -(PRUnichar) 0x0900 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+1E00 to U+27FF
     if((((PRUnichar)0x1E00)<=u)&&(u<=((PRUnichar)0x27FF))) {
-        pat = gGenCatPat[gGenCatIdx3 [( u -(PRUnichar) 0x1E00 )]];
+        pat = gGenCatPat[gGenCatIdx3 [( u -(PRUnichar) 0x1E00 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+3000 to U+33FF
     if((((PRUnichar)0x3000)<=u)&&(u<=((PRUnichar)0x33FF))) {
-        pat = gGenCatPat[gGenCatIdx4 [( u -(PRUnichar) 0x3000 )]];
+        pat = gGenCatPat[gGenCatIdx4 [( u -(PRUnichar) 0x3000 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+F900 to U+FFFF
     if((((PRUnichar)0xF900)<=u)&&(u<=((PRUnichar)0xFFFF))) {
-        pat = gGenCatPat[gGenCatIdx5 [( u -(PRUnichar) 0xF900 )]];
+        pat = gGenCatPat[gGenCatIdx5 [( u -(PRUnichar) 0xF900 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 

intl/unicharutil/tools/gencattable.pl

@@ -292,7 +292,7 @@ for($t = 1; $t <= $tt; $t++)
    $th = $range[($t-1) * 2 + 1];
    printf OUT "    // Handle U+%04X to U+%04X\n", $tl, $th;
    printf OUT "    if((((PRUnichar)0x%04X)<=u)&&(u<=((PRUnichar)0x%04X))) {\n", $tl, $th;
-   printf OUT "        pat = gGenCatPat[gGenCatIdx%d [( u -(PRUnichar) 0x%04X )]];\n", $t, $tl;
+   printf OUT "        pat = gGenCatPat[gGenCatIdx%d [( u -(PRUnichar) 0x%04X ) / 8]];\n", $t, $tl;
    printf OUT "        return (pat  >> ((u % 8) * 4)) & 0x0F;\n";
    printf OUT "    }\n\n";
 }

widget/src/gtk/nsWindow.cpp

@@ -1226,6 +1226,7 @@ GdkCursor *nsWindow::GtkCreateCursor(nsCursor aCursorType)
       break;
     default:
       NS_ASSERTION(aCursorType, "Invalid cursor type");
+      gdkcursor = gdk_cursor_new(GDK_LEFT_PTR);
       break;
   }