Merge pull request #5 from marado/upstream

fix buffer overflow

src/Makefile

@@ -43,7 +43,8 @@ IDENTDCPPFLAGS = -I$(INCDIR)
 #IDENTDCPPFLAGS = -I$(INCDIR) -DMANDNS
 
 # These are sort of gcc dependant; roll your own if you use another compiler
-CFLAGS         = -g -O2 -Wall -W
+CFLAGS         = -g -Wall -W
+#CFLAGS         = -g -O2 -Wall -W
 #CFLAGS         = -g -O0 -fno-inline
 #CFLAGS         = -g -O2 -Wall -W -Wfloat-equal -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wpacked -Wnested-externs -Winline -Wlong-long
 #CFLAGS         = -g -O2 -Wall -W -pedantic -Wfloat-equal -Wtraditional -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -Wpacked -Wpadded -Wredundant-decls -Wnested-externs -Wunreachable-code -Winline -Wlong-long

src/amnuts230.c

@@ -6924,7 +6924,7 @@ help_amnuts_credits(UR_OBJECT user)
 void
 status(UR_OBJECT user)
 {
-  char ir[ROOM_NAME_LEN + 1], text2[ARR_SIZE], text3[ARR_SIZE], rm[3],
+  char ir[ROOM_NAME_LEN + 1], text2[ARR_SIZE], text3[ARR_SIZE], rm[4],
     qcall[USER_NAME_LEN];
   char email[82], nm[5], muzlev[20], arrlev[20];
   UR_OBJECT u;

src/includes/globals.h

@@ -607,7 +607,7 @@ const struct colour_codes_struct colour_codes[] = {
 /*
  * some general arrays being defined
  */
-const char *const noyes[] = { "NO", "YES" };
+const char *const noyes[] = { "NO", "YES" }; // 3 characters max
 const char *const offon[] = { "OFF", "ON" };
 const char *const minmax[] = { "OFF", "MIN", "MAX" };
 const char *const sex[] = { "Neuter", "Male", "Female" };