diff options
| author | Corey Bryant <corey.bryant@canonical.com> | 2020-01-14 15:47:44 -0500 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2020-01-28 16:33:01 -0800 |
| commit | 0eb6cd321e312e32b3ad12c34089466eae60cd88 (patch) | |
| tree | 36407680d3b09afe0e4e1a95bf0e3d6d047e19d9 | |
| parent | 135c3a272fccd983174cbfe10ef2b01e142dc4ee (diff) | |
| download | liberasurecode-0eb6cd321e312e32b3ad12c34089466eae60cd88.tar.gz | |
Fix create_fake_frags_no_meta to use memset to fill frags
These aren't C strings; we shouldn't be using strncpy and friends.
Change-Id: I50cd7922dfa377ea27f3c9558a8a7268120ec733
Closes-Bug: #1859710
| -rw-r--r-- | test/liberasurecode_test.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/test/liberasurecode_test.c b/test/liberasurecode_test.c index d3ca200..e60140f 100644 --- a/test/liberasurecode_test.c +++ b/test/liberasurecode_test.c @@ -385,8 +385,8 @@ int *create_skips_array(struct ec_args *args, int skip) return buf; } -static int create_fake_frags_no_meta(char ***array, int num_frags, - const char *data, int data_len) +inline static int create_fake_frags_no_meta(char ***array, int num_frags, + const char data, int data_len) { // N.B. The difference from creat_frags_arry is to creat new // memory allocation and set a copy of data/parity there. The @@ -404,8 +404,7 @@ static int create_fake_frags_no_meta(char ***array, int num_frags, // add data and parity frags ptr = *array; for (i = 0; i < num_frags; i++) { - *ptr = (char *) malloc(data_len); - strncpy(*ptr++, data, data_len); + *ptr++ = create_buffer(data_len, data); _num_frags++; } @@ -660,7 +659,6 @@ static void test_decode_invalid_args() // fake_data len should be bigger than fragment_header_t for // the verifications int fake_data_len = 1024; - char *fake_data = create_buffer(fake_data_len, 'y'); desc = liberasurecode_instance_create(EC_BACKEND_NULL, &null_args); if (-EBACKENDNOTAVAIL == desc) { @@ -672,9 +670,8 @@ static void test_decode_invalid_args() // test with invalid fragments (no metadata headers) num_avail_frags = create_fake_frags_no_meta(&avail_frags, (null_args.k + null_args.m), - fake_data, fake_data_len); + 'y', fake_data_len); assert(num_avail_frags > 0); - free(fake_data); rc = liberasurecode_decode(desc, avail_frags, num_avail_frags, fake_data_len, 1, @@ -697,7 +694,7 @@ static void test_decode_invalid_args() // test with num_fragments < (k) num_avail_frags = create_fake_frags_no_meta(&avail_frags, (null_args.k - 1), - " ", 1); + ' ', 1); assert(num_avail_frags > 0); rc = liberasurecode_decode(desc, avail_frags, num_avail_frags, fake_data_len, 1, |