liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4051 from dlichtenberger/cli_empty_args_fix

Browse Source 
Fix crash on empty command line arguments
This commit is contained in:
Beep6581
2017-09-03 17:01:05 +02:00
committed by GitHub
parent d434a09055 f5628dd5b3
commit ae9afd31f1
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/main-cli.cc
View File

@@ -285,8 +285,7 @@ bool dontLoadCache ( int argc, char **argv )
#if ECLIPSE_ARGS
currParam = currParam.substr (1, currParam.length() - 2);
#endif
if ( currParam.at (0) == '-' && currParam.at (1) == 'q' ) {
if ( currParam.length() > 1 && currParam.at(0) == '-' && currParam.at(1) == 'q' ) {
return true;
}
}
@@ -317,6 +316,9 @@ int processLineParams ( int argc, char **argv )
for ( int iArg = 1; iArg < argc; iArg++) {
Glib::ustring currParam (argv[iArg]);
if ( currParam.empty() ) {
continue;
}
#if ECLIPSE_ARGS
currParam = currParam.substr (1, currParam.length() - 2);
#endif

4
rtgui/main.cc
View File

@@ -122,6 +122,9 @@ int processLineParams ( int argc, char **argv )
{
for ( int iArg = 1; iArg < argc; iArg++) {
Glib::ustring currParam (argv[iArg]);
if ( currParam.empty() ) {
continue;
}
#if ECLIPSE_ARGS
currParam = currParam.substr (1, currParam.length() - 2);
#endif
@@ -697,4 +700,3 @@ int main (int argc, char **argv)
return ret;
}