diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-18 02:14:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-18 02:14:52 +0400 |
| commit | 6075a24fc4c24dd69a49db68fc76039e86199a15 (patch) | |
| tree | 4461a87a5cf019f614b7e2fd7e5d4960234dce03 /source | |
| parent | be4b29b849f75959142370b13420640c917406a3 (diff) | |
fix for invalid use of strncat (N == how many bytes may be appended, not the final string size).
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 96a59ee4542..e17ce84406b 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -654,6 +654,7 @@ static int fluid_validate_scene(ReportList *reports, Scene *scene, Object *fsDom #define FLUID_SUFFIX_CONFIG "fluidsim.cfg" +#define FLUID_SUFFIX_CONFIG_TMP (FLUID_SUFFIX_CONFIG ".tmp") #define FLUID_SUFFIX_SURFACE "fluidsurface" static int fluid_init_filepaths(Object *fsDomain, char *targetDir, char *targetFile, char *debugStrBuffer) @@ -663,7 +664,7 @@ static int fluid_init_filepaths(Object *fsDomain, char *targetDir, char *targetF FILE *fileCfg; int dirExist = 0; char newSurfdataPath[FILE_MAX]; // modified output settings - const char *suffixConfig = FLUID_SUFFIX_CONFIG; + const char *suffixConfigTmp = FLUID_SUFFIX_CONFIG_TMP; int outStringsChanged = 0; // prepare names... @@ -673,9 +674,8 @@ static int fluid_init_filepaths(Object *fsDomain, char *targetDir, char *targetF BLI_strncpy(newSurfdataPath, domainSettings->surfdataPath, FILE_MAXDIR); /* if 0'd out below, this value is never used! */ BLI_path_abs(targetDir, relbase); // fixed #frame-no - BLI_join_dirfile(targetFile, FILE_MAX, targetDir, suffixConfig); /* .tmp: dont overwrite/delete original file */ - strncat(targetFile, ".tmp", FILE_MAX); + BLI_join_dirfile(targetFile, FILE_MAX, targetDir, suffixConfigTmp); // make sure all directories exist // as the bobjs use the same dir, this only needs to be checked @@ -881,7 +881,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor int gridlevels = 0; const char *relbase= modifier_path_relbase(fsDomain); const char *strEnvName = "BLENDER_ELBEEMDEBUG"; // from blendercall.cpp - const char *suffixConfig = FLUID_SUFFIX_CONFIG; + const char *suffixConfigTmp = FLUID_SUFFIX_CONFIG_TMP; const char *suffixSurface = FLUID_SUFFIX_SURFACE; char targetDir[FILE_MAX]; // store & modify output settings @@ -994,8 +994,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor /* ******** start writing / exporting ******** */ // use .tmp, dont overwrite/delete original file - BLI_join_dirfile(targetFile, sizeof(targetFile), targetDir, suffixConfig); - strncat(targetFile, ".tmp", sizeof(targetFile)); + BLI_join_dirfile(targetFile, sizeof(targetFile), targetDir, suffixConfigTmp); // make sure these directories exist as well if(outStringsChanged) { |