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 de9a07bc91..dba389ff39 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -436,19 +436,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)