[Bf-blender-cvs] [ea7a276] master: Cycles: Fix possible buffer overflow in OIIO cache error message

[Sergey Sharybin]

Commit: ea7a2766f6054bf991dee746408f45c535c324b5
Author: Sergey Sharybin
Date:   Wed Jan 6 23:09:48 2016 +0500
Branches: master
https://developer.blender.org/rBea7a2766f6054bf991dee746408f45c535c324b5

Cycles: Fix possible buffer overflow in OIIO cache error message

===================================================================

M	intern/cycles/kernel/osl/osl_services.cpp

===================================================================

diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index 23c441e..8838c28 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;