archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- possibly bugfix /w uninitialized vars [#23270] Long directory name segmentation fault in File brower.

Browse Source 
- in exceptional cases vertcos_to_key() could return with KeyBlock pointing to freed memory.
- invalid use of realloc() in BLI_builddir()
This commit is contained in:
Campbell Barton
2010-08-11 22:36:43 +00:00
parent 350e6d22fd
commit aae5c9b58d
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/key.c
View File

@@ -1850,9 +1850,12 @@ void vertcos_to_key(Object *ob, KeyBlock *kb, float (*vertCos)[3])
tot= count_curveverts(&cu->nurb); tot= count_curveverts(&cu->nurb);
} }
fp= kb->data= MEM_callocN(tot*elemsize, "key_to_vertcos vertCos"); if (tot == 0) {
kb->data= NULL;
return;
}
if (tot == 0) return; fp= kb->data= MEM_callocN(tot*elemsize, "key_to_vertcos vertCos");
/* Copy coords to keyblock */ /* Copy coords to keyblock */

15
source/blender/blenlib/intern/storage.c
View File

@@ -237,8 +237,19 @@ void BLI_builddir(char *dirname, char *relname)
if (newnum){ if (newnum){
if (files) files=(struct direntry *)realloc(files,(totnum+newnum) * sizeof(struct direntry)); if(files) {
else files=(struct direntry *)malloc(newnum * sizeof(struct direntry)); void *tmp= realloc(files, (totnum+newnum) * sizeof(struct direntry));
if(tmp) {
files= (struct direntry *)tmp;
}
else { /* realloc fail */
free(files);
files= NULL;
}
}
if(files==NULL)
files=(struct direntry *)malloc(newnum * sizeof(struct direntry));
if (files){ if (files){
dlink = (struct dirlink *) dirbase->first; dlink = (struct dirlink *) dirbase->first;

4
source/blender/imbuf/intern/thumbs.c
View File

@@ -248,8 +248,8 @@ ImBuf* IMB_thumb_create(const char* path, ThumbSize size, ThumbSource source, Im
char tdir[FILE_MAX]; char tdir[FILE_MAX];
char temp[FILE_MAX]; char temp[FILE_MAX];
char mtime[40]= "0"; /* incase we can't stat the file */ char mtime[40]= "0"; /* incase we can't stat the file */
char cwidth[40]; char cwidth[40]= "0"; /* incase images have no data */
char cheight[40]; char cheight[40]= "0";
char thumb[40]; char thumb[40];
short tsize = 128; short tsize = 128;
short ex, ey; short ex, ey;

4
source/blender/python/doc/sphinx_doc_gen.py
View File

@@ -269,11 +269,11 @@ def pymodule2sphinx(BASEPATH, module_name, module, title):
descr_items = [(key, descr) for key, descr in sorted(value.__dict__.items()) if not key.startswith("__")] descr_items = [(key, descr) for key, descr in sorted(value.__dict__.items()) if not key.startswith("__")]
for key, descr in descr_items: for key, descr in descr_items:
if type(descr) == ClassMethodDescriptorType: # GetSetDescriptorType's are not documented yet if type(descr) == ClassMethodDescriptorType:
py_descr2sphinx(" ", fw, descr, module_name, type_name, key) py_descr2sphinx(" ", fw, descr, module_name, type_name, key)
for key, descr in descr_items: for key, descr in descr_items:
if type(descr) == MethodDescriptorType: # GetSetDescriptorType's are not documented yet if type(descr) == MethodDescriptorType:
py_descr2sphinx(" ", fw, descr, module_name, type_name, key) py_descr2sphinx(" ", fw, descr, module_name, type_name, key)
for key, descr in descr_items: for key, descr in descr_items: