[Bf-blender-cvs] [84f21eb] temp-cycles-microdisplacement: Fix possible overflow when setting geometry cache size

[Mai Lavelle]

Commit: 84f21eb8764b9697716b5adc54706fce7d7c13a9
Author: Mai Lavelle
Date:   Mon Apr 18 14:47:48 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rB84f21eb8764b9697716b5adc54706fce7d7c13a9

Fix possible overflow when setting geometry cache size

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

M	intern/cycles/blender/blender_sync.cpp

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

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index cf728cb..faacdac 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -502,7 +502,7 @@ SceneParams BlenderSync::get_scene_params(BL::Scene& b_scene,
 		params.use_qbvh = false;
 	}
 
-	params.geom_cache_max_size = (size_t)get_int(cscene, "geom_cache_max_size") * 1024*1024;
+	params.geom_cache_max_size = std::min((size_t)get_int(cscene, "geom_cache_max_size"), SIZE_MAX/(1024*1024)) * 1024*1024;
 
 	return params;
 }