summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2017-01-11 10:51:15 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2017-01-11 10:51:15 (GMT)
commita59604a7c466f09bd2756fcc568c044cbba7dd79 (patch)
tree68dc8a4d9a6b01fe2552e0189e05f9455cdf9887 /generic
parentb1caabe329c6e8ee762ae50d31c663627feacd94 (diff)
downloadtk-a59604a7c466f09bd2756fcc568c044cbba7dd79.zip
tk-a59604a7c466f09bd2756fcc568c044cbba7dd79.tar.gz
tk-a59604a7c466f09bd2756fcc568c044cbba7dd79.tar.bz2
Alternative proposed solution for [d4fb4e80d220e46e588f310291fd7a4205e8cd67|d4fb4e80d2], with test-case.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkImgPhoto.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 4ee9f69..1bd0142 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -1540,7 +1540,11 @@ ParseSubcommandOptions(
*/
if (!(allowedOptions & bit)) {
- goto unknownOrAmbiguousOption;
+ if (optPtr->name != NULL) {
+ goto unknownOrAmbiguousOption;
+ }
+ optPtr->name = objv[index];
+ continue;
}
/*