summaryrefslogtreecommitdiff
path: root/sal/rtl/source/ustring.c
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-01-23 03:24:45 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-01-23 03:24:45 +0200
commitc59895173854200f581fcd04c7cbcfb142efde0b (patch)
treed1a20e3d04aa5b5fbe3628a5eebe84a418139fa1 /sal/rtl/source/ustring.c
parent1bff69d294c0c8311bfc439ff5e24f2c84c9195a (diff)
Dont assert in safe situations
Diffstat (limited to 'sal/rtl/source/ustring.c')
-rw-r--r--sal/rtl/source/ustring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/rtl/source/ustring.c b/sal/rtl/source/ustring.c
index 317d24d88d90..2bb685992c6b 100644
--- a/sal/rtl/source/ustring.c
+++ b/sal/rtl/source/ustring.c
@@ -552,7 +552,7 @@ static void rtl_string2UString_status( rtl_uString** ppThis,
sal_uInt32 nCvtFlags,
sal_uInt32 *pInfo )
{
- OSL_ENSURE(rtl_isOctetTextEncoding(eTextEncoding),
+ OSL_ENSURE(nLen == 0 || rtl_isOctetTextEncoding(eTextEncoding),
"rtl_string2UString_status() - Wrong TextEncoding" );
if ( !nLen )