diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:30:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:30:21 +0000 |
| commit | b172c872df7c40113646ebbd45a2ebd429205814 (patch) | |
| tree | 56f91474f93733992708c278737a379213b992b0 /sal | |
| parent | 66f869f0030eb7cf0bad6a0536eb29aa1cbe31fb (diff) | |
INTEGRATION: CWS sb14 (1.15.18); FILE MERGED
2004/03/11 14:41:34 sb 1.15.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/module.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sal/osl/w32/module.c b/sal/osl/w32/module.c index 6bf580c4e202..69438affb40a 100644 --- a/sal/osl/w32/module.c +++ b/sal/osl/w32/module.c @@ -2,9 +2,9 @@ * * $RCSfile: module.c,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: hr $ $Date: 2004-02-03 13:30:33 $ + * last change: $Author: rt $ $Date: 2004-03-30 16:30:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -214,6 +214,7 @@ static sal_Bool SAL_CALL _osl_addressGetModuleURL_Windows( void *pv, rtl_uString rtl_uString *ustrSysPath = NULL; rtl_string2UString( &ustrSysPath, me32.szExePath, strlen(me32.szExePath), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); + OSL_ASSERT(ustrSysPath != NULL); osl_getFileURLFromSystemPath( ustrSysPath, pustrURL ); rtl_uString_release( ustrSysPath ); @@ -328,6 +329,7 @@ static sal_Bool SAL_CALL _osl_addressGetModuleURL_NT4( void *pv, rtl_uString **p rtl_uString *ustrSysPath = NULL; rtl_string2UString( &ustrSysPath, ModuleInfo.LoadedImageName, strlen(ModuleInfo.LoadedImageName), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); + OSL_ASSERT(ustrSysPath != NULL); osl_getFileURLFromSystemPath( ustrSysPath, pustrURL ); rtl_uString_release( ustrSysPath ); } |