diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:28:54 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:28:54 +0000 |
| commit | f99b70fe9942f13380f8c23263522d863c89ce7d (patch) | |
| tree | 4863f734ef771f4838ee3e2de5b465ee42ec3ad3 /sal/osl | |
| parent | c09459729a2249e129fce96d0d3eba86466e6493 (diff) | |
INTEGRATION: CWS sb14 (1.29.18); FILE MERGED
2004/03/11 14:41:32 sb 1.29.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/osl')
| -rw-r--r-- | sal/osl/unx/module.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c index 7258da90fff0..4dd1b4f08cdc 100644 --- a/sal/osl/unx/module.c +++ b/sal/osl/unx/module.c @@ -2,9 +2,9 @@ * * $RCSfile: module.c,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: hr $ $Date: 2004-02-03 13:20:04 $ + * last change: $Author: rt $ $Date: 2004-03-30 16:28:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -514,6 +514,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr OSL_TRACE( "module.c::osl_getModuleURLFromAddress - %s\n", imageName ); #endif rtl_string2UString( ppLibraryUrl, imageName, strlen(imageName), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); + OSL_ASSERT(*ppLibraryUrl != NULL); osl_getFileURLFromSystemPath( *ppLibraryUrl, ppLibraryUrl ); // convert it to be a file url osl_getAbsoluteFileURL( workDir, *ppLibraryUrl, ppLibraryUrl ); // ensure it is an abosolute file url } @@ -531,6 +532,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr #endif rtl_string2UString(ppLibraryUrl, dl_info.dli_fname, strlen(dl_info.dli_fname), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS); + OSL_ASSERT(*ppLibraryUrl != NULL); osl_getFileURLFromSystemPath(*ppLibraryUrl, ppLibraryUrl); // convert it to be a file url osl_getAbsoluteFileURL(workDir, *ppLibraryUrl, ppLibraryUrl); // ensure it is an abosolute file url |