Blame SOURCES/liberasurecode-1.6.1-nostrncpy.patch

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