diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:30:34 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:30:34 +0000 |
| commit | 70c8e646f3ac104bc966ac7853f3ae38f5c86bcb (patch) | |
| tree | 35eb0ec6a44d44f3e13e7472a78e808d829f4353 | |
| parent | b172c872df7c40113646ebbd45a2ebd429205814 (diff) | |
INTEGRATION: CWS sb14 (1.8.18); FILE MERGED
2004/03/11 14:41:34 sb 1.8.18.1: #i21150# rtl_string2UString and OUString::OUString(sal_Char const *, sal_Int32, rtl_TextEncoding, sal_uInt32) handle out-of-memory conditions.
| -rw-r--r-- | sal/osl/w32/security.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c index c8e831d966d2..ff24190a5b2e 100644 --- a/sal/osl/w32/security.c +++ b/sal/osl/w32/security.c @@ -2,9 +2,9 @@ * * $RCSfile: security.c,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2004-02-03 13:33:02 $ + * last change: $Author: rt $ $Date: 2004-03-30 16:30:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -713,6 +713,7 @@ static sal_Bool GetSpecialFolder(rtl_uString **strPath, int nFolder) if (pSHGetSpecialFolderPathA(GetActiveWindow(), PathA, nFolder, TRUE)) { rtl_string2UString( strPath, PathA, strlen(PathA), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS); + OSL_ASSERT(*strPath != NULL); bRet = sal_True; } } @@ -798,6 +799,7 @@ static sal_Bool GetSpecialFolder(rtl_uString **strPath, int nFolder) CreateDirectoryA(PathA, NULL); rtl_string2UString( strPath, PathA, strlen(PathA), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS); + OSL_ASSERT(*strPath != NULL); bRet = sal_True; } } |