Eric Pouech : winegcc: Check that option argument is within command line parameters.

Alexandre Julliard julliard at winehq.org
Thu Apr 7 07:36:56 CDT 2011


Module: wine
Branch: stable
Commit: 41481f5509f50da9d9232ba4a4c6c28ca116d413
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=41481f5509f50da9d9232ba4a4c6c28ca116d413

Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sat Mar 26 12:16:51 2011 +0100

winegcc: Check that option argument is within command line parameters.
(cherry picked from commit a5cbdcb8bb4dbc7fcf9acc7b8d673ecebe64f496)

---

 tools/winegcc/winegcc.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 2400601..ea3e527 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -1282,7 +1282,11 @@ int main(int argc, char **argv)
 			next_is_arg = 1;
 		    break;
 	    }
-	    if (next_is_arg) option_arg = argv[i+1];
+	    if (next_is_arg)
+            {
+                if (i + 1 >= argc) error("option -%c requires an argument\n", argv[i][1]);
+                option_arg = argv[i+1];
+            }
 
 	    /* determine what options go 'as is' to the linker & the compiler */
 	    raw_compiler_arg = raw_linker_arg = 0;




More information about the wine-cvs mailing list