diff options
| author | Cedric BAIL <cedric.bail@free.fr> | 2010-08-13 15:21:52 +0000 |
|---|---|---|
| committer | Cedric BAIL <cedric.bail@free.fr> | 2010-08-13 15:21:52 +0000 |
| commit | 8e04325cfc63127ccce41f54d62ff6090e2aafe7 (patch) | |
| tree | ea3d3732bbd7e2fce7c83edbea56f695b37f0aca /src/tests | |
| parent | d57b01a87bfecf3d2202652c68c87c71b9c450e4 (diff) | |
| download | eet-8e04325cfc63127ccce41f54d62ff6090e2aafe7.tar.gz | |
* eet: fix bad allocation case triggered by edje new file format.
Bad news, I also discovered in the same time that we introduced an
API/ABI breakage in 1.3.0. This patch does prevent it from coming
again, sadly, it imply an ABI break that I didn't find a proper
way to work around. So recompile eet and all the program that use
it after that commit.
SVN revision: 51080
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/eet_data_suite.c | 2 | ||||
| -rw-r--r-- | src/tests/eet_suite.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/tests/eet_data_suite.c b/src/tests/eet_data_suite.c index 5ec7e01..f6fb7f1 100644 --- a/src/tests/eet_data_suite.c +++ b/src/tests/eet_data_suite.c @@ -63,5 +63,7 @@ eet_test_setup_eddc(Eet_Data_Descriptor_Class * eddc) eddc->func.hash_free = (void *)_eet_eina_hash_free; eddc->func.str_direct_alloc = (void *)_eet_str_direct_alloc; eddc->func.str_direct_free = (void *)_eet_str_direct_free; + eddc->func.array_alloc = NULL; + eddc->func.array_free = NULL; } /* eet_test_setup_eddc */ diff --git a/src/tests/eet_suite.c b/src/tests/eet_suite.c index ce36fac..9c4d5f0 100644 --- a/src/tests/eet_suite.c +++ b/src/tests/eet_suite.c @@ -1121,7 +1121,8 @@ START_TEST(eet_file_data_dump_test) memset(&etbt.charray, 0, sizeof(etbt.charray)); etbt.charray[0] = "test"; - eet_eina_file_data_descriptor_class_set(&eddc, "Eet_Test_Ex_Type", + eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc), + "Eet_Test_Ex_Type", sizeof(Eet_Test_Ex_Type)); edd = eet_data_descriptor_file_new(&eddc); @@ -2041,7 +2042,8 @@ START_TEST(eet_connection_check) memset(&etbt.charray, 0, sizeof(etbt.charray)); etbt.charray[0] = "test"; - eet_eina_file_data_descriptor_class_set(&eddc, "Eet_Test_Ex_Type", + eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc), + "Eet_Test_Ex_Type", sizeof(Eet_Test_Ex_Type)); edd = eet_data_descriptor_file_new(&eddc); @@ -2113,7 +2115,7 @@ START_TEST(eet_fp) EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f1", f1, EET_T_F32P32); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f0", f0, EET_T_F32P32); - eet_eina_stream_data_descriptor_class_set(&eddc, "Eet_5FP", sizeof (Eet_5DBL)); + eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "Eet_5FP", sizeof (Eet_5DBL)); edd_5DBL = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "fp32", fp32, EET_T_DOUBLE); @@ -2175,7 +2177,7 @@ START_TEST(eet_file_fp) EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f1", f1, EET_T_F32P32); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f0", f0, EET_T_F32P32); - eet_eina_file_data_descriptor_class_set(&eddc, "Eet_5FP", sizeof (Eet_5DBL)); + eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc), "Eet_5FP", sizeof (Eet_5DBL)); edd_5DBL = eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "fp32", fp32, EET_T_DOUBLE); |