Check for param=NULL before dereferencing it in sopt case.

svn path=/trunk/yasm/; revision=462

diff --git a/frontends/yasm/yasm-options.c b/frontends/yasm/yasm-options.c
index 2158d67ac3535fbf1a4cb8c3ef5f7baca4ac6b90..a8aea3e81c2a80b1eca9fa216176e1979eb9e7a5 100644 (file)
--- a/frontends/yasm/yasm-options.c
+++ b/frontends/yasm/yasm-options.c
@@ -98,7 +98,7 @@ parse_cmdline(int argc, char **argv, opt_option *options, size_t nopts)
 
                        if (options[i].takes_param) {
                            param = argv[1];
-                           if (*param == '-' || param == NULL) {
+                           if (param == NULL || *param == '-') {
                                ErrorNow(_("option '-%c' needs an argument!"),
                                         options[i].sopt);
                                errors++;

diff --git a/src/options.c b/src/options.c
index 2158d67ac3535fbf1a4cb8c3ef5f7baca4ac6b90..a8aea3e81c2a80b1eca9fa216176e1979eb9e7a5 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -98,7 +98,7 @@ parse_cmdline(int argc, char **argv, opt_option *options, size_t nopts)
 
                        if (options[i].takes_param) {
                            param = argv[1];
-                           if (*param == '-' || param == NULL) {
+                           if (param == NULL || *param == '-') {
                                ErrorNow(_("option '-%c' needs an argument!"),
                                         options[i].sopt);
                                errors++;