Every file in this commit has a change to check the return value of a call.

2 files changed, 19 insertions, 6 deletions

diff --git a/core/launcher/qprocess_unix.cpp b/core/launcher/qprocess_unix.cpp
index 97c0460..3125bcc 100644
--- a/core/launcher/qprocess_unix.cpp
+++ b/core/launcher/qprocess_unix.cpp
@@ -313,7 +313,11 @@ void QProcessManager::removeMe()
 void QProcessManager::sigchldHnd( int fd )
 {
     char tmp;
-    ::read( fd, &tmp, sizeof(tmp) );
+    if (::read( fd, &tmp, sizeof(tmp) ) < 0)
+#if defined(QT_QPROCESS_DEBUG)
+        odebug << "QProcessManager::sigchldHnd() failed dummy read of file descriptor" << oendl;
+#endif
+        ;
 #if defined(QT_QPROCESS_DEBUG)
     odebug << "QProcessManager::sigchldHnd()" << oendl;
 #endif
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 921b790..c45265a 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -367,16 +367,24 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
     } else if ( msg == "rdiffApplyPatch(QString,QString)" ) {
         QString baseFile, deltaFile;
         stream >> baseFile >> deltaFile;
+        bool fileWasCreated = false;
         if ( !QFile::exists( baseFile ) ) {
             QFile f( baseFile );
-            f.open( IO_WriteOnly );
+            fileWasCreated = f.open( IO_WriteOnly );
             f.close();
         }
-        QRsync::applyDiff( baseFile, deltaFile );
+        if ( fileWasCreated ) {
+            QRsync::applyDiff( baseFile, deltaFile );
 #ifndef QT_NO_COP
-        QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" );
-        e << baseFile;
+            QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" );
+            e << baseFile;
 #endif
+        } else {
+#ifndef QT_NO_COP
+            QCopEnvelope e( "QPE/Desktop", "patchUnapplied(QString)" );
+            e << baseFile;
+#endif
+        }
     } else if ( msg == "rdiffCleanup()" ) {
         mkdir( "/tmp/rdiff" );
         QDir dir;
@@ -998,7 +1006,8 @@ void Server::startSoundServer() {
 
     process->clearArguments();
     *process << QPEApplication::qpeDir() + "bin/qss";
-    process->start();
+    if (!process->start())
+        owarn << "Sound server process did not start" << oendl;
 }
 
 void Server::soundServerExited() {