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

Fix crash on empty command line arguments

Browse Source
This commit is contained in:
Daniel Lichtenberger 2017-09-01 20:01:28 +02:00
parent f3b4722e4f
commit f5628dd5b3
2 changed files with 7 additions and 3 deletions
Show Stats 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 #if ECLIPSE_ARGS
currParam = currParam.substr (1, currParam.length() - 2); currParam = currParam.substr (1, currParam.length() - 2);
#endif #endif
if ( currParam.length() > 1 && currParam.at(0) == '-' && currParam.at(1) == 'q' ) {
if ( currParam.at (0) == '-' && currParam.at (1) == 'q' ) {
return true; return true;
} }
} }
@ -317,6 +316,9 @@ int processLineParams ( int argc, char **argv )
for ( int iArg = 1; iArg < argc; iArg++) { for ( int iArg = 1; iArg < argc; iArg++) {
Glib::ustring currParam (argv[iArg]); Glib::ustring currParam (argv[iArg]);
if ( currParam.empty() ) {
continue;
}
#if ECLIPSE_ARGS #if ECLIPSE_ARGS
currParam = currParam.substr (1, currParam.length() - 2); currParam = currParam.substr (1, currParam.length() - 2);
#endif #endif

4
rtgui/main.cc
View File

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