blender
/
blender
131
398
Fork 577
Code Issues 6.2k Pull Requests 743 Projects 19 Wiki Activity

Fix T45204: String Splitting Function Bug: Using OpenEXR function even if compiled without OpenEXR. 

Seriously!!!

Also, fix a potential buffer overrun here.

This should be backported to final release.
This commit is contained in:
Bastien Montagne 2015-06-26 19:41:51 +02:00
parent ddeb8c595f
commit 851d7535d9
Notes: blender-bot 2023-02-14 08:58:01 +01:00 
Referenced by issue #45204, String Splitting Function Bug: Using OpenEXR function even if compiled without OpenEXR. Easy to fix.
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/render/intern/source/render_result.c
View File

@ -459,9 +459,10 @@ static int passtype_from_name(const char *str)
static void set_pass_name(char *passname, int passtype, int channel, const char *view)
{
const char *end;
const char *token;
int len;
const char delims[] = {'.', '\0'};
char *sep;
char *token;
size_t len;
const char *passtype_name = name_from_passtype(passtype, channel);
@ -470,13 +471,14 @@ static void set_pass_name(char *passname, int passtype, int channel, const char
return;
}
end = passtype_name + strlen(passtype_name);
len = IMB_exr_split_token(passtype_name, end, &token);
len = BLI_str_rpartition(passtype_name, delims, &sep, &token);
if (len == strlen(passtype_name))
sprintf(passname, "%s.%s", passtype_name, view);
else
sprintf(passname, "%.*s%s.%s", (int)(end-passtype_name) - len, passtype_name, view, token);
if (sep) {
BLI_snprintf(passname, EXR_PASS_MAXNAME, "%.*s.%s.%s", (int)len, passtype_name, view, token);
}
else {
BLI_snprintf(passname, EXR_PASS_MAXNAME, "%s.%s", passtype_name, view);
}
}
/********************************** New **************************************/