summaryrefslogtreecommitdiff
path: root/sal/rtl/source
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2009-09-07 17:06:13 +0200
committersb <sb@openoffice.org>2009-09-07 17:06:13 +0200
commit7ea98d0a677f26895fa9fbe9446b394bab0dbf5e (patch)
tree3c4c91c11dfdb564b4b48fbc2db468ec7c32582b /sal/rtl/source
parent2261e520232d0bc3e34e55418b011c5c71b3a3ff (diff)
#i101955# rtl_string2UString_status must set *pInfo on every path through the function body
Diffstat (limited to 'sal/rtl/source')
-rw-r--r--sal/rtl/source/ustring.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sal/rtl/source/ustring.c b/sal/rtl/source/ustring.c
index bfe9a7c5f2bd..b938caf0d4b1 100644
--- a/sal/rtl/source/ustring.c
+++ b/sal/rtl/source/ustring.c
@@ -558,7 +558,12 @@ static void rtl_string2UString_status( rtl_uString** ppThis,
"rtl_string2UString_status() - Wrong TextEncoding" );
if ( !nLen )
+ {
rtl_uString_new( ppThis );
+ if (pInfo != NULL) {
+ *pInfo = 0;
+ }
+ }
else
{
if ( *ppThis )
@@ -589,6 +594,9 @@ static void rtl_string2UString_status( rtl_uString** ppThis,
nLen--;
}
while ( nLen );
+ if (pInfo != NULL) {
+ *pInfo = 0;
+ }
}
else
{