Permalink
Browse files

Merge pull request #5 from marado/upstream

fix buffer overflow
  • Loading branch information...
amnuts committed Mar 6, 2015
2 parents 4318ec6 + 0698106 commit b9a1eca730b479ad68f25a42e38b9c46021250de
Showing with 4 additions and 3 deletions.
  1. +2 −1 src/Makefile
  2. +1 −1 src/amnuts230.c
  3. +1 −1 src/includes/globals.h
View
@@ -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
View
@@ -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;
View
@@ -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" };

0 comments on commit b9a1eca

Please sign in to comment.