fix [#27084] Crash when chosing non-voxel data file in voxel data texture input
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Apr 2011 00:28:05 +0000 (00:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Apr 2011 00:28:05 +0000 (00:28 +0000)
also found loading voxel textures wasn't closing files it opened.

source/blender/makesrna/intern/rna_texture.c
source/blender/render/intern/source/voxeldata.c

index 0bab914d3d0a06fce3c66aaae2b0c662c866a956..d8eec152831d20a3edb2555e581a40f757fd3bf8 100644 (file)
@@ -1638,7 +1638,7 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna)
        
        prop= RNA_def_property(srna, "resolution", PROP_INT, PROP_NONE);
        RNA_def_property_int_sdna(prop, NULL, "resol");
-       RNA_def_property_range(prop, 1, INT_MAX);
+       RNA_def_property_range(prop, 1, 100000);
        RNA_def_property_ui_text(prop, "Resolution", "Resolution of the voxel grid");
        RNA_def_property_update(prop, 0, "rna_Texture_voxeldata_update");
        
index 4cb18c8cdcc34e09ad352e87b0b8be0fea8faf47..b8cb5c21337225283a765c07ec104109116f5ef5 100644 (file)
 #include "texture.h"
 #include "voxeldata.h"
 
+static int is_vd_res_ok(VoxelData *vd)
+{
+       /* arbitrary large value so corrupt headers dont break */
+       const int min= 1, max= 100000;
+       return  (vd->resol[0] >= min && vd->resol[0] <= max) &&
+                       (vd->resol[1] >= min && vd->resol[1] <= max) &&
+                       (vd->resol[2] >= min && vd->resol[2] <= max);
+}
+
+/* use size_t because the result may exceed INT_MAX */
+static size_t vd_resol_size(VoxelData *vd)
+{
+       return (size_t)vd->resol[0] * (size_t)vd->resol[1] * (size_t)vd->resol[2];
+}
+
 static int load_frame_blendervoxel(VoxelData *vd, FILE *fp, int frame)
 {      
+       const size_t size = vd_resol_size(vd);
        size_t offset = sizeof(VoxelDataHeader);
-       int size = (vd->resol[0])*(vd->resol[1])*(vd->resol[2]);
        
+       if(is_vd_res_ok(vd) == FALSE)
+               return 0;
+
        vd->dataset = MEM_mapallocN(sizeof(float)*size, "voxel dataset");
-       
+       if(vd->dataset == NULL) return 0;
+
        if(fseek(fp, frame*size*sizeof(float)+offset, 0) == -1)
                return 0;
        if(fread(vd->dataset, sizeof(float), size, fp) != size)
@@ -83,19 +102,32 @@ static int load_frame_blendervoxel(VoxelData *vd, FILE *fp, int frame)
 
 static int load_frame_raw8(VoxelData *vd, FILE *fp, int frame)
 {
-       int size = (vd->resol[0])*(vd->resol[1])*(vd->resol[2]);
+       const size_t size = vd_resol_size(vd);
        char *data_c;
        int i;
-       
+
+       if(is_vd_res_ok(vd) == FALSE)
+               return 0;
+
        vd->dataset = MEM_mapallocN(sizeof(float)*size, "voxel dataset");
+       if(vd->dataset == NULL) return 0;
        data_c = (char *)MEM_mallocN(sizeof(char)*size, "temporary voxel file reading storage");
-       
+       if(data_c == NULL) {
+               MEM_freeN(vd->dataset);
+               vd->dataset= NULL;
+               return 0;
+       }
+
        if(fseek(fp,(frame-1)*size*sizeof(char),0) == -1) {
                MEM_freeN(data_c);
+               MEM_freeN(vd->dataset);
+               vd->dataset= NULL;
                return 0;
        }
        if(fread(data_c, sizeof(char), size, fp) != size) {
                MEM_freeN(data_c);
+               MEM_freeN(vd->dataset);
+               vd->dataset= NULL;
                return 0;
        }
        
@@ -138,7 +170,7 @@ static void load_frame_image_sequence(VoxelData *vd, Tex *tex)
        vd->resol[0] = ibuf->x;
        vd->resol[1] = ibuf->y;
        vd->resol[2] = iuser.frames;
-       vd->dataset = MEM_mapallocN(sizeof(float)*(vd->resol[0])*(vd->resol[1])*(vd->resol[2]), "voxel dataset");
+       vd->dataset = MEM_mapallocN(sizeof(float)*vd_resol_size(vd), "voxel dataset");
        
        for (z=0; z < iuser.frames; z++)
        {       
@@ -205,12 +237,12 @@ static void init_frame_smoke(VoxelData *vd, float cfra)
                        if(cfra < smd->domain->point_cache[0]->startframe)
                                ; /* don't show smoke before simulation starts, this could be made an option in the future */
                        else if (vd->smoked_type == TEX_VD_SMOKEHEAT) {
-                               int totRes;
+                               size_t totRes;
+                               size_t i;
                                float *heat;
-                               int i;
 
                                VECCOPY(vd->resol, smd->domain->res);
-                               totRes = (vd->resol[0])*(vd->resol[1])*(vd->resol[2]);
+                               totRes= vd_resol_size(vd);
 
                                // scaling heat values from -2.0-2.0 to 0.0-1.0
                                vd->dataset = MEM_mapallocN(sizeof(float)*(totRes), "smoke data");
@@ -226,12 +258,12 @@ static void init_frame_smoke(VoxelData *vd, float cfra)
                                //vd->dataset = smoke_get_heat(smd->domain->fluid);
                        }
                        else if (vd->smoked_type == TEX_VD_SMOKEVEL) {
-                               int totRes;
+                               size_t totRes;
+                               size_t i;
                                float *xvel, *yvel, *zvel;
-                               int i;
 
                                VECCOPY(vd->resol, smd->domain->res);
-                               totRes = (vd->resol[0])*(vd->resol[1])*(vd->resol[2]);
+                               totRes= vd_resol_size(vd);
 
                                // scaling heat values from -2.0-2.0 to 0.0-1.0
                                vd->dataset = MEM_mapallocN(sizeof(float)*(totRes), "smoke data");
@@ -247,7 +279,7 @@ static void init_frame_smoke(VoxelData *vd, float cfra)
 
                        }
                        else {
-                               int totRes;
+                               size_t totRes;
                                float *density;
 
                                if (smd->domain->flags & MOD_SMOKE_HIGHRES) {
@@ -258,8 +290,8 @@ static void init_frame_smoke(VoxelData *vd, float cfra)
                                        density = smoke_get_density(smd->domain->fluid);
                                }
 
-                               totRes = (vd->resol[0])*(vd->resol[1])*(vd->resol[2]);
-
+                               /* TODO: is_vd_res_ok(rvd) doesnt check this resolution */
+                               totRes= vd_resol_size(vd);
                                /* always store copy, as smoke internal data can change */
                                vd->dataset = MEM_mapallocN(sizeof(float)*(totRes), "smoke data");
                                memcpy(vd->dataset, density, sizeof(float)*totRes);
@@ -310,9 +342,8 @@ static void cache_voxeldata(struct Render *re, Tex *tex)
                        
                        if(read_voxeldata_header(fp, vd))
                                load_frame_blendervoxel(vd, fp, curframe-1);
-                       else
-                               fclose(fp);
-                       
+
+                       fclose(fp);
                        return;
                case TEX_VD_RAW_8BIT:
                        BLI_path_abs(path, G.main->name);
@@ -320,11 +351,8 @@ static void cache_voxeldata(struct Render *re, Tex *tex)
                        fp = fopen(path,"rb");
                        if (!fp) return;
                        
-                       if (load_frame_raw8(vd, fp, curframe))
-                               ;
-                       else    
-                               fclose(fp);
-                       
+                       load_frame_raw8(vd, fp, curframe);
+                       fclose(fp);
                        return;
        }
 }