shared: FileSaver: Don't launch SandboxedProcessor for empty files

shared/filesaver.cpp

@@ -124,36 +124,39 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
 			}
 		}
 
-		QProcess process;
+		if(fileInfo.size() > 0)
-		QStringList args;
-		args << "process" << canonicalPath;
-		process.setProcessChannelMode(QProcess::ForwardedErrorChannel);
-		process.start("/proc/self/exe", args);
-		process.waitForStarted();
-		process.waitForFinished();
-
-		/* TODO: This is suboptimal as it eats lots of mem
-		 * but avoids a weird QDataStream/QProcess behaviour
-		 * where it thinks the process has ended when it has not...
-		 *
-		 * Also, there seem to be issues with reads not being blocked, so
-		 * the only reliable way appears to be waiting until the process
-		 * finishes.
-		 */
-		QDataStream in(process.readAllStandardOutput());
-		while(!in.atEnd())
 		{
-			PageData pd;
+			QProcess process;
-			in >> pd;
+			QStringList args;
-			pageData.append(pd);
+			args << "process" << canonicalPath;
-		}
+			process.setProcessChannelMode(QProcess::ForwardedErrorChannel);
-		processorReturnCode = process.exitCode();
+			process.start("/proc/self/exe", args);
-		if(processorReturnCode != OK && processorReturnCode != OK_WASEMPTY)
+			process.waitForStarted();
-		{
+			process.waitForFinished();
-			Logger::error() << "FileSaver::saveFile(): Error while processing" << canonicalPath << ":"
-							<< "Exit code " << processorReturnCode << Qt::endl;
 
-			return static_cast<SaveFileResult>(processorReturnCode);
+			/* TODO: This is suboptimal as it eats lots of mem
+			 * but avoids a weird QDataStream/QProcess behaviour
+			 * where it thinks the process has ended when it has not...
+			 *
+			 * Also, there seem to be issues with reads not being blocked, so
+			 * the only reliable way appears to be waiting until the process
+			 * finishes.
+			 */
+			QDataStream in(process.readAllStandardOutput());
+			while(!in.atEnd())
+			{
+				PageData pd;
+				in >> pd;
+				pageData.append(pd);
+			}
+			processorReturnCode = process.exitCode();
+			if(processorReturnCode != OK && processorReturnCode != OK_WASEMPTY)
+			{
+				Logger::error() << "FileSaver::saveFile(): Error while processing" << canonicalPath << ":"
+								<< "Exit code " << processorReturnCode << Qt::endl;
+
+				return static_cast<SaveFileResult>(processorReturnCode);
+			}
 		}
 	}
 	SaveFileResult result = this->dbService->saveFile(fileInfo, pageData);