From 35af20a8ed477f53e3a82b3d32d9cf44e5b0dc34 Mon Sep 17 00:00:00 2001 From: Takayuki ORITO Date: Sun, 11 Mar 2018 22:24:21 +0900 Subject: Fix devtool's segmentation fault when using operation change the name of the variable to parse the arguments of operation command. Change-Id: I251b17e6e48b0a5c12636199de57bbb761b3ac23 Reviewed-by: Katja Marttila --- tools/devtool/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/devtool/main.cpp b/tools/devtool/main.cpp index 7418efda6..e0b31695c 100644 --- a/tools/devtool/main.cpp +++ b/tools/devtool/main.cpp @@ -237,13 +237,13 @@ int main(int argc, char *argv[]) .collections()); // setup the binary format engine OperationRunner runner(magicMarker, operations); - const QStringList arguments = arguments.last().split(QLatin1Char(',')); - if (arguments.first() == QLatin1String("DO")) - result = runner.runOperation(arguments.mid(1), OperationRunner::RunMode::Do); - else if (arguments.first() == QLatin1String("UNDO")) - result = runner.runOperation(arguments.mid(1), OperationRunner::RunMode::Undo); + const QStringList operationArguments = arguments.last().split(QLatin1Char(',')); + if (operationArguments.first() == QLatin1String("DO")) + result = runner.runOperation(operationArguments.mid(1), OperationRunner::RunMode::Do); + else if (operationArguments.first() == QLatin1String("UNDO")) + result = runner.runOperation(operationArguments.mid(1), OperationRunner::RunMode::Undo); else - std::cerr << "Malformed argument: " << qPrintable(arguments.last()) << std::endl; + std::cerr << "Malformed argument: " << qPrintable(operationArguments.last()) << std::endl; } } catch (const QInstaller::Error &error) { -- cgit v1.2.3