diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:30:08 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:30:08 +0000 |
| commit | 66f869f0030eb7cf0bad6a0536eb29aa1cbe31fb (patch) | |
| tree | d1f5c62c2a24197feaead9d4882b5bbe533831a6 /sal | |
| parent | 9d06c153ac1be4d3fc5f3a9c69d17dc4beb25ac7 (diff) | |
INTEGRATION: CWS sb14 (1.2.18); FILE MERGED
2004/03/17 10:15:41 sb 1.2.18.2: #i26602# Fixed typo.
2004/03/11 14:41:34 sb 1.2.18.1: #i21150# rtl_string2UString and OUString::OUString(sal_Char const *, sal_Int32, rtl_TextEncoding, sal_uInt32) handle out-of-memory conditions.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/file.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index 5acb3e7cbb1d..55c37c49d71a 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -2,9 +2,9 @@ * * $RCSfile: file.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-02-03 13:29:23 $ + * last change: $Author: rt $ $Date: 2004-03-30 16:30:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1979,8 +1979,10 @@ namespace /* private */ *pDest++ = 0; - if ( bValidEncoded ) + if ( bValidEncoded ) { rtl_string2UString( pstrDecodedURL, pBuffer, rtl_str_getLength(pBuffer), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS ); + OSL_ASSERT(*pstrDecodedURL != 0); + } rtl_freeMemory( pBuffer ); @@ -2207,6 +2209,7 @@ namespace /* private */ /* Provide URL via unicode string */ rtl_string2UString( pstrURL, rtl_string_getStr(strEncodedURL), rtl_string_getLength(strEncodedURL), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS ); + OSL_ASSERT(*pstrURL != 0); rtl_string_release( strEncodedURL ); } |