diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 10:48:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 10:48:49 +0000 |
| commit | eea62a3946b964256a82234bc0a9e5610e4571c0 (patch) | |
| tree | 9cd2d98ee42c557a4793268c4a4504a3bb5f2d6d /package/source | |
| parent | 7f201d2e1b0e7c06a34842a5842787c8a979341b (diff) | |
INTEGRATION: CWS fwk75_SRC680 (1.46.18); FILE MERGED
2007/09/05 09:28:57 mav 1.46.18.1: #i81280# integrate the patch
Diffstat (limited to 'package/source')
| -rw-r--r-- | package/source/zipapi/ZipFile.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 7ee1febe4a75..9156ae34ccc5 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ZipFile.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: rt $ $Date: 2007-04-03 14:08:01 $ + * last change: $Author: hr $ $Date: 2007-11-02 11:48:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -789,13 +789,13 @@ sal_Int32 ZipFile::readCEN() aEntry.nOffset += nLocPos; aEntry.nOffset *= -1; - if ( aEntry.nNameLen > ZIP_MAXNAMELEN ) + if ( aEntry.nNameLen < 0 || aEntry.nNameLen > ZIP_MAXNAMELEN ) throw ZipException( OUString( RTL_CONSTASCII_USTRINGPARAM ( "name length exceeds ZIP_MAXNAMELEN bytes" ) ), Reference < XInterface > () ); - if ( nCommentLen > ZIP_MAXNAMELEN ) + if ( nCommentLen < 0 || nCommentLen > ZIP_MAXNAMELEN ) throw ZipException( OUString( RTL_CONSTASCII_USTRINGPARAM ( "comment length exceeds ZIP_MAXNAMELEN bytes" ) ), Reference < XInterface > () ); - if ( aEntry.nExtraLen > ZIP_MAXEXTRA ) + if ( aEntry.nExtraLen < 0 || aEntry.nExtraLen > ZIP_MAXEXTRA ) throw ZipException( OUString( RTL_CONSTASCII_USTRINGPARAM ( "extra header info exceeds ZIP_MAXEXTRA bytes") ), Reference < XInterface > () ); aEntry.sName = rtl::OUString::intern ( (sal_Char *) aMemGrabber.getCurrentPos(), |