INTEGRATION: CWS ab17fixes (1.13.8); FILE MERGED

2005/06/20 11:17:24 ab 1.13.8.2: RESYNC: (1.13-1.14); FILE MERGED
2005/05/04 14:12:40 ab 1.13.8.1: #i45570# SbiImage::AddString(): Fixed overflow problem

1 files changed, 53 insertions, 25 deletions

diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 1809b3d0a55b..15622c7f39ac 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -1,35 +1,61 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
  *  $RCSfile: image.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
+ *
+ *  last change: $Author: hr $ $Date: 2005-09-29 12:39:45 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 21:24:25 $
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source 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.openoffice.org/license.html.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
  *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  Copyright: 2000 by Sun Microsystems, Inc.
  *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
+ *  All Rights Reserved.
  *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
+ *  Contributor(s): _______________________________________
  *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
  *
  ************************************************************************/
 
@@ -383,10 +409,12 @@ void SbiImage::AddString( const String& r )
             bError = TRUE;  // out of mem!
         else if( (USHORT) needed > nStringSize )
         {
-            UINT16 nNewLen = needed + 1024;
-            nNewLen &= 0xFC00;  // trim to 1K border
-            sal_Unicode* p = new sal_Unicode[ nNewLen ];
-            if( p )
+            UINT32 nNewLen = needed + 1024;
+            nNewLen &= 0xFFFFFC00;  // trim to 1K border
+            if( nNewLen > 0xFF00L )
+                nNewLen = 0xFF00L;
+            sal_Unicode* p = NULL;
+            if( (p = new sal_Unicode[ nNewLen ]) != NULL )
             {
                 memcpy( p, pStrings, nStringSize * sizeof( sal_Unicode ) );
                 delete[] pStrings;