diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2016-05-20 21:43:46 +0900 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2016-05-20 21:46:50 +0900 |
commit | a52c7da7140a04017916e3a130d3dcb7af385cf4 (patch) | |
tree | 7f9f8aabb149e8e5ec9b5cd2dbb1241d20489320 | |
parent | f40a452ee140b0cdc3734eb59b4beb51d2db88d2 (diff) | |
download | efl-a52c7da7140a04017916e3a130d3dcb7af385cf4.tar.gz |
evas 3d - fix mesh savers/loaders to not leave memory unset
i've been gettign persistent evas test suite suite failures ffor a
while. annoying as i can't get 100% pass anymore. it's due to segv's
in evas test suite thanks to chunks of uninitialized memory in the
mesh loaders/saver code.
this fixes that
@fix
-rw-r--r-- | src/modules/evas/model_loaders/ply/evas_model_load_ply.c | 6 | ||||
-rw-r--r-- | src/modules/evas/model_savers/eet/evas_model_save_eet.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c index 971e951613..35e011f5e1 100644 --- a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c +++ b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c @@ -191,9 +191,9 @@ void evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file) { char *current = NULL, *map = NULL; - Evas_Model_Load_Save_Header header; - Evas_Model_Load_Save_Data data; - Evas_Model_Load_Save_Stride stride; + Evas_Model_Load_Save_Header header = { 0 }; + Evas_Model_Load_Save_Data data = { 0 }; + Evas_Model_Load_Save_Stride stride = { 0 }; map = eina_file_map_all(file, EINA_FILE_SEQUENTIAL); if (map == NULL) diff --git a/src/modules/evas/model_savers/eet/evas_model_save_eet.c b/src/modules/evas/model_savers/eet/evas_model_save_eet.c index 8d82da530e..ec1857ac00 100644 --- a/src/modules/evas/model_savers/eet/evas_model_save_eet.c +++ b/src/modules/evas/model_savers/eet/evas_model_save_eet.c @@ -20,9 +20,9 @@ _set_geometry_to_eet_file_from_mesh(Evas_Canvas3D_Mesh_Data *mesh, int i; float *src; Evas_Canvas3D_Vertex_Eet *vertices = - malloc(sizeof(Evas_Canvas3D_Vertex_Eet) * mesh->vertex_count); + calloc(1, sizeof(Evas_Canvas3D_Vertex_Eet) * mesh->vertex_count); Evas_Canvas3D_Geometry_Eet *geometry = - malloc(sizeof(Evas_Canvas3D_Geometry_Eet)); + calloc(1, sizeof(Evas_Canvas3D_Geometry_Eet)); int *geometries = malloc(sizeof(int)); if ((vertices == NULL) || (geometry == NULL)) |