X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=6b9e85487fbe3a35f5d1bb51efedfa8fdf29962d;hb=566205d159a20e4f86b54f5f2398b401df73d2e8;hp=1e65185420139d768f9a9d0cde816d0d2bf76545;hpb=45cb613eb2a95c13857b1919c97d3a0db5b8f9ec;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 1e65185..6b9e854 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -5,7 +5,7 @@
  * Massachusetts. 
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -1462,6 +1462,15 @@ ExitArgError(char *msg, char *badArg)
   exit(2);
 }
 
+int
+ValidateInt(char *s)
+{
+  char *p = s;
+  if(*p == '-' || *p == '+') p++;
+  while(*p) if(!isdigit(*p++)) ExitArgError("Bad integer value", s);
+  return atoi(s);
+}
+
 /* Command line font name parser.  NULL name means do nothing.
    Syntax like "Courier New:10.0 bi" or "Arial:10" or "Arial:10b"
    For backward compatibility, syntax without the colon is also
@@ -1773,19 +1782,19 @@ ParseArgs(GetFunc get, void *cl)
 
     switch (ad->argType) {
     case ArgInt:
-      *(int *) ad->argLoc = atoi(argValue);
+      *(int *) ad->argLoc = ValidateInt(argValue);
       break;
 
     case ArgX:
-      *(int *) ad->argLoc = atoi(argValue) + boardX; // [HGM] placement: translate stored relative to absolute 
+      *(int *) ad->argLoc = ValidateInt(argValue) + boardX; // [HGM] placement: translate stored relative to absolute 
       break;
 
     case ArgY:
-      *(int *) ad->argLoc = atoi(argValue) + boardY; // (this is really kludgey, it should be done where used...)
+      *(int *) ad->argLoc = ValidateInt(argValue) + boardY; // (this is really kludgey, it should be done where used...)
       break;
 
     case ArgZ:
-      *(int *) ad->argLoc = atoi(argValue);
+      *(int *) ad->argLoc = ValidateInt(argValue);
       EnsureOnScreen(&boardX, &boardY, minX, minY); 
       break;
 
@@ -3286,6 +3295,8 @@ InitDrawingSizes(BoardSize boardSize, int flags)
     blackRect.right = blackRect.left + boardWidth/2 - 1;
     blackRect.top = whiteRect.top;
     blackRect.bottom = whiteRect.bottom;
+
+    logoHeight = 0; // [HGM] logo: suppress logo after change to tiny layout!
   }
 
   messageRect.left = OUTER_MARGIN + MESSAGE_LINE_LEFTMARGIN;