Hash :
c2fb36ca
Author :
Thomas de Grivel
Date :
2025-07-15T20:19:01
fix: marshall function parameter mismatches - Add missing heap parameter to marshall_tag call in kc3.c:718 - Add missing heap parameter to marshall_uw call in marshall.c:278 - Add missing heap parameter to marshall_tag call in marshall.c:282 - Fix marshall_heap_pointer function signature to match header declaration - Fix marshall_list parameter to be const s_list * to match header - Update test macros to include heap parameter and rename to MARSHALL_TEST_BUF_* - Fix direct marshall_u32 calls in test functions to include heap parameter
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216
/* kc3
* Copyright from 2022 to 2025 kmx.io <contact@kmx.io>
*
* Permission is hereby granted to use this software granted the above
* copyright notice and this permission paragraph are included in all
* copies and substantial portions of this software.
*
* THIS SOFTWARE IS PROVIDED "AS-IS" WITHOUT ANY GUARANTEE OF
* PURPOSE AND PERFORMANCE. IN NO EVENT WHATSOEVER SHALL THE
* AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
* THIS SOFTWARE.
*/
#include <assert.h>
#include <endian.h>
#include "../libkc3/file.h"
#include "../libkc3/marshall.h"
#include "../libkc3/str.h"
#include "test.h"
#define MARSHALL_TEST(type, heap, test, expected) \
do { \
s_marshall m = {0}; \
TEST_ASSERT(marshall_init(&m)); \
TEST_ASSERT(marshall_ ## type (&m, heap, (type) (test))); \
TEST_MEM_EQ(m.buf.ptr.pu8, sizeof(type), \
(expected), sizeof(expected) - 1); \
marshall_clean(&m); \
} while (0)
#define MARSHALL_TEST_BUF_U8(test, expected) \
MARSHALL_TEST(u8, false, test, expected)
#define MARSHALL_TEST_BUF_U16(test, expected) \
MARSHALL_TEST(u16, false, test, expected)
#define MARSHALL_TEST_BUF_U32(test, expected) \
MARSHALL_TEST(u32, false, test, expected)
#define MARSHALL_TEST_BUF_U64(test, expected) \
MARSHALL_TEST(u64, false, test, expected)
#define MARSHALL_TEST_BUF_UW(test, expected) \
MARSHALL_TEST(uw, false, test, expected)
#define MARSHALL_TEST_BUF_S8(test, expected) \
MARSHALL_TEST(s8, false, test, expected)
#define MARSHALL_TEST_BUF_S16(test, expected) \
MARSHALL_TEST(s16, false, test, expected)
#define MARSHALL_TEST_BUF_S32(test, expected) \
MARSHALL_TEST(s32, false, test, expected)
#define MARSHALL_TEST_BUF_S64(test, expected) \
MARSHALL_TEST(s64, false, test, expected)
#define MARSHALL_TEST_BUF_SW(test, expected) \
MARSHALL_TEST(sw, false, test, expected)
void marshal_test (void);
TEST_CASE_PROTOTYPE(marshall_u8);
TEST_CASE_PROTOTYPE(marshall_u16);
TEST_CASE_PROTOTYPE(marshall_u32);
TEST_CASE_PROTOTYPE(marshall_u64);
TEST_CASE_PROTOTYPE(marshall_uw);
TEST_CASE_PROTOTYPE(marshall_s8);
TEST_CASE_PROTOTYPE(marshall_s16);
TEST_CASE_PROTOTYPE(marshall_s32);
TEST_CASE_PROTOTYPE(marshall_s64);
TEST_CASE_PROTOTYPE(marshall_sw);
TEST_CASE_PROTOTYPE(marshall_to_buf);
TEST_CASE_PROTOTYPE(marshall_to_file);
TEST_CASE_PROTOTYPE(marshall_to_str);
void marshall_test (void)
{
TEST_CASE_RUN(marshall_u8);
TEST_CASE_RUN(marshall_u16);
TEST_CASE_RUN(marshall_u32);
TEST_CASE_RUN(marshall_u64);
TEST_CASE_RUN(marshall_uw);
TEST_CASE_RUN(marshall_s8);
TEST_CASE_RUN(marshall_s16);
TEST_CASE_RUN(marshall_s32);
TEST_CASE_RUN(marshall_s64);
TEST_CASE_RUN(marshall_sw);
TEST_CASE_RUN(marshall_to_buf);
TEST_CASE_RUN(marshall_to_str);
TEST_CASE_RUN(marshall_to_file);
}
TEST_CASE(marshall_s8)
{
MARSHALL_TEST_BUF_S8(0, "\0");
MARSHALL_TEST_BUF_S8(0xAB, "\xAB");
}
TEST_CASE_END(marshall_s8)
TEST_CASE(marshall_s16)
{
MARSHALL_TEST_BUF_S16(0, "\0\0");
MARSHALL_TEST_BUF_S16(-1, "\xFF\xFF");
}
TEST_CASE_END(marshall_s16)
TEST_CASE(marshall_s32)
{
MARSHALL_TEST_BUF_S32(0, "\0\0\0\0");
MARSHALL_TEST_BUF_S32(~0, "\xFF\xFF\xFF\xFF");
MARSHALL_TEST_BUF_S32(0xDEADBEEF, "\xEF\xBE\xAD\xDE");
MARSHALL_TEST_BUF_S32(0xDEADCAFE, "\xFE\xCA\xAD\xDE");
MARSHALL_TEST_BUF_S32(0xFEEDBABE, "\xBE\xBA\xED\xFE");
}
TEST_CASE_END(marshall_s32)
TEST_CASE(marshall_s64)
{
MARSHALL_TEST_BUF_S64(0, "\0\0\0\0\0\0\0\0");
MARSHALL_TEST_BUF_S64(~0, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF");
}
TEST_CASE_END(marshall_s64)
TEST_CASE(marshall_sw)
{
MARSHALL_TEST_BUF_SW(0, "\0\0\0\0\0\0\0\0");
MARSHALL_TEST_BUF_SW(~0, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF");
}
TEST_CASE_END(marshall_sw)
TEST_CASE(marshall_to_buf)
{
char b[1024024] = {0};
s_buf buf = {0};
s_marshall m = {0};
buf_init(&buf, false, sizeof(b), b);
TEST_ASSERT(marshall_init(&m) != NULL);
TEST_EQ(marshall_to_buf(&m, &buf), sizeof(s_marshall_header));
marshall_clean(&m);
}
TEST_CASE_END(marshall_to_buf)
TEST_CASE(marshall_to_file)
{
u32 value = 42;
s_marshall m = {0};
s_str path = {0};
TEST_ASSERT(marshall_init(&m));
TEST_ASSERT(marshall_u32(&m, false, value));
TEST_EQ(marshall_to_file(&m, ".marshall_test_to_file.1.kc3m"),
sizeof(s_marshall_header) +
sizeof(u32));
TEST_EQ(test_file_compare(".marshall_test_to_file.1.kc3m",
"marshall_test_to_file.1.expected.kc3m"),
0);
TEST_EQ(str_init_1(&path, NULL, ".marshall_test_to_file.1.kc3m"),
&path);
TEST_ASSERT(file_unlink(&path));
marshall_clean(&m);
}
TEST_CASE_END(marshall_to_file)
TEST_CASE(marshall_to_str)
{
u32 value = 424242;
s_marshall m = {0};
s_str str = {0};
s_str expected = {0};
TEST_ASSERT(marshall_init(&m));
TEST_ASSERT(marshall_u32(&m, false, value));
TEST_EQ(marshall_to_str(&m, &str), &str);
marshall_clean(&m);
expected = (s_str) {{0}, 36, {"KC3MARSH"
"\x00\x00\x00\x00\x00\x00\x00\x00"
"\x00\x00\x00\x00\x00\x00\x00\x00"
"\x04\x00\x00\x00\x00\x00\x00\x00"
"\x32\x79\x06\x00"}};
TEST_STR_EQ(str, expected);
str_clean(&str);
}
TEST_CASE_END(marshall_to_str)
TEST_CASE(marshall_u8)
{
MARSHALL_TEST_BUF_U8(0x00, "\x00");
MARSHALL_TEST_BUF_U8(0xFF, "\xFF");
}
TEST_CASE_END(marshall_u8)
TEST_CASE(marshall_u16)
{
MARSHALL_TEST_BUF_U16(0xFFFF, "\xFF\xFF");
}
TEST_CASE_END(marshall_u16)
TEST_CASE(marshall_u32)
{
MARSHALL_TEST_BUF_U32(0xFFFFFFFF, "\xFF\xFF\xFF\xFF");
}
TEST_CASE_END(marshall_u32)
TEST_CASE(marshall_u64)
{
MARSHALL_TEST_BUF_U64(0xFFFFFFFFFFFFFFFF,
"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF");
}
TEST_CASE_END(marshall_u64)
TEST_CASE(marshall_uw)
{
MARSHALL_TEST_BUF_UW(0, "\0\0\0\0\0\0\0\0");
MARSHALL_TEST_BUF_UW(~0, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF");
}
TEST_CASE_END(marshall_uw)