s4: fix arguments to safe_strcpy()

Found by the s3-derivied safe_strcpy() macro.

Andrew Bartlett

diff --git a/lib/util/tests/str.c b/lib/util/tests/str.c
index 6b38feaf43e6c2f1886d3737d4acac1af92ce5f1..b4c45e3751e5e5504ad9acc19d3d7c974d2e438d 100644 (file)
--- 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;

diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 42665ab897aac180be246cccbb57afe2fa3074d5..bfd1aff5e8ab46ca5a883d8579bd75afc36170ef 100644 (file)
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -175,7 +175,7 @@ static void testpair(TALLOC_CTX *mem_ctx, struct smbcli_state *cli, char *mask,
 
        count++;
 
-       safe_strcpy(res1, "---", sizeof(res1));
+       safe_strcpy(res1, "---", sizeof(res1)-1);
 
        state.mem_ctx = mem_ctx;
 
@@ -189,7 +189,7 @@ static void testpair(TALLOC_CTX *mem_ctx, struct smbcli_state *cli, char *mask,
        resultp = res1;
        short_name = talloc_strdup(mem_ctx, "");
        get_real_name(mem_ctx, cli, &long_name, &short_name);
-       safe_strcpy(res1, "---", sizeof(res1));
+       safe_strcpy(res1, "---", sizeof(res1)-1);
        smbcli_list_new(cli->tree, mask,
                        FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
                        RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,