desktop/unx/source/start.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9c130462fd9b3515c3c71428bfc109285ed6ea0b
Author:     Stephan Bergmann <[email protected]>
AuthorDate: Fri Jun 3 10:25:26 2022 +0200
Commit:     Stephan Bergmann <[email protected]>
CommitDate: Fri Jun 3 15:08:19 2022 +0200

    Improve some C code mixing size_t and ssize_t
    
    Change-Id: I9b6082f3e913a9bddcb3bd035b92e829f9b00c07
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135340
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <[email protected]>

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index a83db69e5c66..f959565665cc 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -471,13 +471,14 @@ static sal_Bool send_args(int fd, rtl_uString const 
*pCwdPath)
     }
 
     nLen = rtl_string_getLength(pOut) + 1;
-    bResult = (write(fd, rtl_string_getStr(pOut), nLen) == (ssize_t) nLen);
+    ssize_t n = write(fd, rtl_string_getStr(pOut), nLen);
+    bResult = (n >= 0 && (size_t) n == nLen);
 
     if ( bResult )
     {
         char resp[SAL_N_ELEMENTS("InternalIPC::ProcessingDone")];
-        ssize_t n = read(fd, resp, SAL_N_ELEMENTS(resp));
-        bResult = n == (ssize_t) SAL_N_ELEMENTS(resp)
+        n = read(fd, resp, SAL_N_ELEMENTS(resp));
+        bResult = n == SAL_N_ELEMENTS(resp)
             && (memcmp(
                     resp, "InternalIPC::ProcessingDone",
                     SAL_N_ELEMENTS(resp))

Reply via email to