From eb3b90ec9e2785f9b73a47f0256a750a054084e0 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 16 Nov 2016 15:20:32 +0100 Subject: [PATCH] Handle cryptsetup luksUUID failure. --- src/fs/luks.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp index fe74af9..ab15f1a 100644 --- a/src/fs/luks.cpp +++ b/src/fs/luks.cpp @@ -512,9 +512,19 @@ QString luks::readUUID(const QString& deviceNode) const QString luks::readOuterUUID(const QString &deviceNode) const { + if ( deviceNode.isEmpty() ) + return QString(); + ExternalCommand cmd(QStringLiteral("cryptsetup"), { QStringLiteral("luksUUID"), deviceNode }); if (cmd.run()) { + if ( cmd.exitCode() ) + { + qWarning() << "Cannot get luksUUID for device" << deviceNode + << "\tcryptsetup exit code" << cmd.exitCode() + << "\toutput:" << cmd.output().trimmed(); + return QString(); + } return cmd.output().trimmed(); } return QStringLiteral("---");