diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:31:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:31:11 +0000 |
| commit | 19da84593fe4b88bde9f9b20ed0a5bcbaa578d56 (patch) | |
| tree | 2a6fd2d6899fe50cced41770939af0699eb9ab8f /sal | |
| parent | 24cc9954facd91d89ef90a4bdd36c99062a83a54 (diff) | |
INTEGRATION: CWS sb14 (1.5.36); FILE MERGED
2004/03/11 14:41:35 sb 1.5.36.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/qa/rtl_strings/rtl_OUString.cxx | 6 | ||||
| -rw-r--r-- | sal/qa/rtl_strings/rtl_OUStringBuffer.cxx | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sal/qa/rtl_strings/rtl_OUString.cxx b/sal/qa/rtl_strings/rtl_OUString.cxx index 5806ce30a050..e66a91e03122 100644 --- a/sal/qa/rtl_strings/rtl_OUString.cxx +++ b/sal/qa/rtl_strings/rtl_OUString.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtl_OUString.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2004-03-19 14:57:22 $ + * last change: $Author: rt $ $Date: 2004-03-30 16:31:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -917,6 +917,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_csuc( rtl_string2UString( &tmpUstring, tmpStr, tmpLen, osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); + OSL_ASSERT(tmpUstring != NULL); typedef struct TestCase @@ -973,6 +974,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_getStr( rtl_string2UString( &tmpUstring, tmpStr, tmpLen, osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); + OSL_ASSERT(tmpUstring != NULL); typedef struct TestCase diff --git a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx index d31d543a7ca7..63407e327138 100644 --- a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx +++ b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtl_OUStringBuffer.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2003-12-11 12:34:54 $ + * last change: $Author: rt $ $Date: 2004-03-30 16:31:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -811,6 +811,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_csuc( rtl_string2UString( &tmpUstring, tmpStr, tmpLen, osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); + OSL_ASSERT(tmpUstring != NULL); typedef struct TestCase @@ -865,6 +866,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_getStr( rtl_string2UString( &tmpUstring, tmpStr, tmpLen, osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); + OSL_ASSERT(tmpUstring != NULL); typedef struct TestCase |