summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-01-11 11:19:45 +0100
committerMathias Bauer <mba@openoffice.org>2010-01-11 11:19:45 +0100
commit08d920b23f3817b0e2b5277eb5f3519e5cf355b6 (patch)
treec0b3af176e8969e7d25432a8c98bca80f7a925ae /desktop
parentb587928aa11f05114481d87cb9cc2c936817599e (diff)
#i105875#: check return of fgets
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/misc/dp_misc.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index d63d901290a0..29b581702e01 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -439,19 +439,19 @@ OUString readConsole()
{
OSL_ASSERT((dwRead % 2) == 0);
OUString value( aBuffer, dwRead / 2);
- value = value.trim();
- return value;
+ return value.trim();
}
- return OUString();
-
#else
char buf[1024];
rtl_zeroMemory(buf, 1024);
// read one char less so that the last char in buf is always zero
- fgets(buf, 1024, stdin);
- OUString value = ::rtl::OStringToOUString(::rtl::OString(buf), osl_getThreadTextEncoding());
- return value.trim();
+ if (fgets(buf, 1024, stdin) != NULL)
+ {
+ OUString value = ::rtl::OStringToOUString(::rtl::OString(buf), osl_getThreadTextEncoding());
+ return value.trim();
+ }
#endif
+ return OUString();
}
void TRACE(::rtl::OUString const & sText)