From f28fda763869f75646f904d90f13ea40caf8c925 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 26 Oct 2011 17:30:45 +1100 Subject: [PATCH] s3-torture Remove t_stringoverflow as fstrcpy now uses strlcpy Because we no longer use safe_strcpy() internally, we no longer have a mode where we write to the end of the buffer in developer mode, and so there isn't anything for this test to test. Andrew Bartlett --- source3/Makefile.in | 4 ---- source3/torture/t_stringoverflow.c | 23 ----------------------- 2 files changed, 27 deletions(-) delete mode 100644 source3/torture/t_stringoverflow.c diff --git a/source3/Makefile.in b/source3/Makefile.in index b8841e6c91..b1c8a57b9f 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3184,10 +3184,6 @@ bin/tdbtorture@EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) $(LIBTALLOC) $(LIBTD @$(CC) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) \ $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) -bin/t_stringoverflow@EXEEXT@: $(BINARY_PREREQS) bin/libbigballofmud.@SHLIBEXT@ torture/t_stringoverflow.o - $(CC) -o $@ $(DYNEXP) torture/t_stringoverflow.o \ - -L./bin -lbigballofmud $(LIBWBCLIENT_LIBS) - bin/timelimit@EXEEXT@: script/tests/timelimit.o @echo Linking $@ @$(CC) -o $@ $(DYNEXP) script/tests/timelimit.o diff --git a/source3/torture/t_stringoverflow.c b/source3/torture/t_stringoverflow.c deleted file mode 100644 index 17765e6a2c..0000000000 --- a/source3/torture/t_stringoverflow.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "includes.h" - - int main(void) -{ - char dest[100]; - char *ptr = dest; - - printf("running on valgrind? %d\n", RUNNING_ON_VALGRIND); - - /* Try copying a string into an fstring buffer. The string - * will actually fit, but this is still wrong because you - * can't pstrcpy into an fstring. This should trap in a - * developer build. */ - -#if 0 - /* As of CVS 20030318, this will be trapped at compile time! */ - pstrcpy(dest, "hello"); -#endif /* 0 */ - - fstrcpy(ptr, "hello!"); - - return 0; -} -- 2.34.1