From: Lucas Gabriel Vuotto <l.vuotto92@gmail.com>
Date: Fri, 19 Feb 2016 18:59:49 +0000 (-0300)
Subject: arg.h: fixed argv checks order
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=4fdba860c8db70035e9749806ecc6ca2d7c418d0;p=st.git

arg.h: fixed argv checks order

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>
---

diff --git a/arg.h b/arg.h
index a94e6b5..ba3fb3f 100644
--- 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_;\