diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-24 15:41:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-24 15:41:24 +0000 |
| commit | b801da1b2a0542bca5f9a701284e33f05319e6ff (patch) | |
| tree | 50746af9f3452ebd8702d100262f0ef560c37211 /tools | |
| parent | c0f7e19ead3520f07c50616e84d483c966a0c5b9 (diff) | |
INTEGRATION: CWS sb42 (1.54.28); FILE MERGED
2005/11/28 15:38:18 sb 1.54.28.1: #127202# getAbbreviated could read past the end of the given URL.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index c22db96a6b81..241433a311f5 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -4,9 +4,9 @@ * * $RCSfile: urlobj.cxx,v $ * - * $Revision: 1.54 $ + * $Revision: 1.55 $ * - * last change: $Author: rt $ $Date: 2005-09-09 14:18:38 $ + * last change: $Author: hr $ $Date: 2006-01-24 16:41:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3375,7 +3375,8 @@ INetURLObject::getAbbreviated( = pPrefixBegin + (bAuthority && pPrefixBegin == pCoreBegin ? 2 : 1); - while (p != pSuffixEnd && *p != '/') + OSL_ASSERT(p <= pEnd); + while (p < pEnd && *p != '/') ++p; if (p == pCoreEnd - 1 && *p == '/') ++p; |