qoptions: crash if command line value not given at the end

Chien-Mu · Nov 3, 2014 · 62199e6 · 62199e6
1 parent 21ec216
commit 62199e6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/examples/common/qoptions.cpp b/examples/common/qoptions.cpp
@@ -221,6 +221,8 @@ bool QOptions::parse(int argc, const char *const*argv)
                         //qDebug("%d %s", __LINE__, qPrintable(it_list->value().toString()));
 					} else {
 						it = args.erase(it);
+                        if (it == args.end())
+                            break;
                         it_list->setValue(*it);
                         //qDebug("%d %s", __LINE__, qPrintable(it_list->value().toString()));
 					}
@@ -248,6 +250,8 @@ bool QOptions::parse(int argc, const char *const*argv)
 					}
                     if (it->length() == sname_len+1) {//-o abco
 						it = args.erase(it);
+                        if (it == args.end())
+                            break;
                         it_list->setValue(*it);
                         //qDebug("%d %s", __LINE__, qPrintable(it_list->value().toString()));
 					} else {