sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Fix possible buffer overflow in OIIO cache error message

Browse Source
This commit is contained in:
Sergey Sharybin 2016-01-06 23:09:48 +05:00
parent 03302fd5ed
commit ea7a2766f6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
intern/cycles/kernel/osl/osl_services.cpp
View File

@ -1024,6 +1024,11 @@ bool OSLRenderServices::texture(ustring filename,
if(nchannels == 4)
result[3] = 1.0f;
}
/* This might be slow, but prevents error messages leak and
* other nasty stuff happening.
*/
string err = ts->geterror();
(void)err;
}
return status;
@ -1110,7 +1115,11 @@ bool OSLRenderServices::texture3d(ustring filename,
if(nchannels == 4)
result[3] = 1.0f;
}
/* This might be slow, but prevents error messages leak and
* other nasty stuff happening.
*/
string err = ts->geterror();
(void)err;
}
return status;