summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-03 15:33:31 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-03 07:37:07 +0200
commitd01f318179f9c2a0e6730642d21465b6dd69ea9f (patch)
treec72c39a22f609382417aecc80660b76cf8ac56ec /lib
parentb96389d3e17013fd22a64b6ce54478bd912d06b3 (diff)
downloadsamba-d01f318179f9c2a0e6730642d21465b6dd69ea9f.tar.gz
s4: fix arguments to safe_strcpy()
Found by the s3-derivied safe_strcpy() macro. Andrew Bartlett
Diffstat (limited to 'lib')
-rw-r--r--lib/util/tests/str.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/util/tests/str.c b/lib/util/tests/str.c
index 6b38feaf43e..b4c45e3751e 100644
--- a/lib/util/tests/str.c
+++ b/lib/util/tests/str.c
@@ -25,7 +25,7 @@
static bool test_string_sub_simple(struct torture_context *tctx)
{
char tmp[100];
- safe_strcpy(tmp, "foobar", sizeof(tmp));
+ safe_strcpy(tmp, "foobar", sizeof(tmp)-1);
string_sub(tmp, "foo", "bar", sizeof(tmp));
torture_assert_str_equal(tctx, tmp, "barbar", "invalid sub");
return true;
@@ -34,7 +34,7 @@ static bool test_string_sub_simple(struct torture_context *tctx)
static bool test_string_sub_multiple(struct torture_context *tctx)
{
char tmp[100];
- safe_strcpy(tmp, "fooblafoo", sizeof(tmp));
+ safe_strcpy(tmp, "fooblafoo", sizeof(tmp)-1);
string_sub(tmp, "foo", "bar", sizeof(tmp));
torture_assert_str_equal(tctx, tmp, "barblabar", "invalid sub");
return true;
@@ -43,7 +43,7 @@ static bool test_string_sub_multiple(struct torture_context *tctx)
static bool test_string_sub_longer(struct torture_context *tctx)
{
char tmp[100];
- safe_strcpy(tmp, "foobla", sizeof(tmp));
+ safe_strcpy(tmp, "foobla", sizeof(tmp)-1);
string_sub(tmp, "foo", "blie", sizeof(tmp));
torture_assert_str_equal(tctx, tmp, "bliebla", "invalid sub");
return true;
@@ -52,7 +52,7 @@ static bool test_string_sub_longer(struct torture_context *tctx)
static bool test_string_sub_shorter(struct torture_context *tctx)
{
char tmp[100];
- safe_strcpy(tmp, "foobla", sizeof(tmp));
+ safe_strcpy(tmp, "foobla", sizeof(tmp)-1);
string_sub(tmp, "foo", "bl", sizeof(tmp));
torture_assert_str_equal(tctx, tmp, "blbla", "invalid sub");
return true;
@@ -61,7 +61,7 @@ static bool test_string_sub_shorter(struct torture_context *tctx)
static bool test_string_sub_special_char(struct torture_context *tctx)
{
char tmp[100];
- safe_strcpy(tmp, "foobla", sizeof(tmp));
+ safe_strcpy(tmp, "foobla", sizeof(tmp)-1);
string_sub(tmp, "foo", "%b;l", sizeof(tmp));
torture_assert_str_equal(tctx, tmp, "_b_lbla", "invalid sub");
return true;