FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crash when feed source is not correctly filled

Browse Source
This commit is contained in:
Martin Rotter 2023-07-10 10:14:22 +02:00
parent a10d6e2384
commit 89c687c22f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librssguard/services/standard/standardfeed.cpp
View File

@ -524,7 +524,10 @@ QString StandardFeed::runScriptProcess(const QStringList& cmd_args,
process.setProcessChannelMode(QProcess::ProcessChannelMode::SeparateChannels); process.setProcessChannelMode(QProcess::ProcessChannelMode::SeparateChannels);
process.setWorkingDirectory(working_directory); process.setWorkingDirectory(working_directory);
process.setProgram(cmd_args.at(0)); process.setProgram(cmd_args.at(0));
process.setArguments(cmd_args.mid(1));
if (cmd_args.size() > 1) {
process.setArguments(cmd_args.mid(1));
}
if (!process.open()) { if (!process.open()) {
switch (process.error()) { switch (process.error()) {
@ -574,6 +577,10 @@ QString StandardFeed::runScriptProcess(const QStringList& cmd_args,
QString StandardFeed::generateFeedFileWithScript(const QString& execution_line, int run_timeout) { QString StandardFeed::generateFeedFileWithScript(const QString& execution_line, int run_timeout) {
auto prepared_query = prepareExecutionLine(execution_line); auto prepared_query = prepareExecutionLine(execution_line);
if (prepared_query.isEmpty()) {
throw ScriptException(ScriptException::Reason::ExecutionLineInvalid);
}
return runScriptProcess(prepared_query, qApp->userDataFolder(), run_timeout, false); return runScriptProcess(prepared_query, qApp->userDataFolder(), run_timeout, false);
} }
@ -582,5 +589,9 @@ QString StandardFeed::postProcessFeedFileWithScript(const QString& execution_lin
int run_timeout) { int run_timeout) {
auto prepared_query = prepareExecutionLine(execution_line); auto prepared_query = prepareExecutionLine(execution_line);
if (prepared_query.isEmpty()) {
throw ScriptException(ScriptException::Reason::ExecutionLineInvalid);
}
return runScriptProcess(prepared_query, qApp->userDataFolder(), run_timeout, true, raw_feed_data); return runScriptProcess(prepared_query, qApp->userDataFolder(), run_timeout, true, raw_feed_data);
} }