[Bf-blender-cvs] [e608f2e] master: Fix crash enabling Use Multiview on images with an empty filepath.
Brecht Van Lommel
noreply at git.blender.org
Sat Feb 20 17:57:11 CET 2016
Commit: e608f2e7ecb76a7ad8e64d2454cf29308207d068
Author: Brecht Van Lommel
Date: Sat Feb 20 17:43:31 2016 +0100
Branches: master
https://developer.blender.org/rBe608f2e7ecb76a7ad8e64d2454cf29308207d068
Fix crash enabling Use Multiview on images with an empty filepath.
===================================================================
M source/blender/blenkernel/intern/scene.c
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 48fd34e..3c6498e 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2530,13 +2530,15 @@ void BKE_scene_multiview_view_prefix_get(Scene *scene, const char *name, char *r
/* begin of extension */
index_act = BLI_str_rpartition(name, delims, rext, &suf_act);
+ if (*rext == NULL)
+ return;
BLI_assert(index_act > 0);
UNUSED_VARS_NDEBUG(index_act);
for (srv = scene->r.views.first; srv; srv = srv->next) {
if (BKE_scene_multiview_is_render_view_active(&scene->r, srv)) {
size_t len = strlen(srv->suffix);
- if (STREQLEN(*rext - len, srv->suffix, len)) {
+ if (strlen(*rext) >= len && STREQLEN(*rext - len, srv->suffix, len)) {
BLI_strncpy(rprefix, name, strlen(name) - strlen(*rext) - len + 1);
break;
}
More information about the Bf-blender-cvs
mailing list