Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-01-06 21:09:48 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-01-06 21:09:48 +0300
commitea7a2766f6054bf991dee746408f45c535c324b5 (patch)
tree21fbb2cbfcbb66d8fd0377f61c22b7042ea22969 /intern/cycles/kernel/osl
parent03302fd5edb154623f073e15a46e24f94445a3f4 (diff)
Cycles: Fix possible buffer overflow in OIIO cache error message
Diffstat (limited to 'intern/cycles/kernel/osl')
-rw-r--r--intern/cycles/kernel/osl/osl_services.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index 23c441e28ef..8838c28ca13 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -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;