diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-20 19:43:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-20 19:56:56 +0300 |
| commit | e608f2e7ecb76a7ad8e64d2454cf29308207d068 (patch) | |
| tree | cb9a66c66956287a3e43782516590f09fb2bc4c8 | |
| parent | 95180a46ed019205c7bb7449e1d92010fe172316 (diff) | |
Fix crash enabling Use Multiview on images with an empty filepath.
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 48fd34e38f4..3c6498e0236 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; } |