diff options
author | Ton Roosendaal <ton@blender.org> | 2006-07-12 14:48:05 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-07-12 14:48:05 +0400 |
commit | 500a68f0ad326bb1f2ad088ebef3cf1da031a3b1 (patch) | |
tree | bc0ed1c7077f054f4bc9da312aa7cf3df002626d | |
parent | d6ef293851896d57772df717ef99455fa19691cb (diff) |
- ray.c: a string was assinged to stats drawing, but not cleared. could
create buffer overflows in string drawing
- removed static variable from renderwin.c. No fix, just nicer code.
-rw-r--r-- | source/blender/render/intern/source/ray.c | 1 | ||||
-rw-r--r-- | source/blender/src/renderwin.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/ray.c b/source/blender/render/intern/source/ray.c index 671fe0c5537..8d676295220 100644 --- a/source/blender/render/intern/source/ray.c +++ b/source/blender/render/intern/source/ray.c @@ -538,6 +538,7 @@ void makeoctree(Render *re) sprintf(str, "Filling Octree: %d", v); re->i.infostr= str; re->stats_draw(&re->i); + re->i.infostr= NULL; lasttime= time; } } diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 760b1e1ef91..224f5859652 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -863,7 +863,7 @@ void make_renderinfo_string(RenderStats *rs, char *str) { extern char info_time_str[32]; // header_info.c extern unsigned long mem_in_use, mmap_in_use; - static float megs_used_memory, mmap_used_memory; + float megs_used_memory, mmap_used_memory; char *spos= str; megs_used_memory= (mem_in_use-mmap_in_use)/(1024.0*1024.0); |