]> git.armaanb.net Git - st.git/commitdiff
arg.h: fixed argv checks order
authorLucas Gabriel Vuotto <l.vuotto92@gmail.com>
Fri, 19 Feb 2016 18:59:49 +0000 (15:59 -0300)
committerChristoph Lohmann <20h@r-36.net>
Sun, 21 Feb 2016 16:21:41 +0000 (17:21 +0100)
This prevents accessing to a potentially out-of-bounds memory section.

Signed-off-by: Lucas Gabriel Vuotto <l.vuotto92@gmail.com>
Signed-off-by: Christoph Lohmann <20h@r-36.net>
arg.h

diff --git a/arg.h b/arg.h
index a94e6b51bc987a7c67424b96179318cd4f0936ea..ba3fb3fdb9ac264cf36eb286a36dabd9907a7126 100644 (file)
--- a/arg.h
+++ b/arg.h
@@ -10,8 +10,8 @@ extern char *argv0;
 
 /* use main(int argc, char *argv[]) */
 #define ARGBEGIN       for (argv0 = *argv, argv++, argc--;\
-                                       argv[0] && argv[0][1]\
-                                       && argv[0][0] == '-';\
+                                       argv[0] && argv[0][0] == '-'\
+                                       && argv[0][1];\
                                        argc--, argv++) {\
                                char argc_;\
                                char **argv_;\