[Bf-blender-cvs] [75e8e3779bc] master: Curves: Fix wrong bitset being checked against CYCLIC bit flag
Sergey Sharybin
noreply at git.blender.org
Thu Sep 28 11:39:26 CEST 2017
Commit: 75e8e3779bcf59622b9e7c43529ca9f91b40a917
Author: Sergey Sharybin
Date: Thu Sep 28 14:33:59 2017 +0500
Branches: master
https://developer.blender.org/rB75e8e3779bcf59622b9e7c43529ca9f91b40a917
Curves: Fix wrong bitset being checked against CYCLIC bit flag
Based on report from Talos Security Advisory.
===================================================================
M source/blender/blenkernel/intern/curve.c
===================================================================
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 795feb58bf6..9c7473f24d1 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -4039,7 +4039,7 @@ bool BKE_nurb_check_valid_u(struct Nurb *nu)
return true; /* not a nurb, lets assume its valid */
if (nu->pntsu < nu->orderu) return false;
- if (((nu->flag & CU_NURB_CYCLIC) == 0) && (nu->flagu & CU_NURB_BEZIER)) { /* Bezier U Endpoints */
+ if (((nu->flagu & CU_NURB_CYCLIC) == 0) && (nu->flagu & CU_NURB_BEZIER)) { /* Bezier U Endpoints */
if (nu->orderu == 4) {
if (nu->pntsu < 5)
return false; /* bezier with 4 orderu needs 5 points */
@@ -4060,7 +4060,7 @@ bool BKE_nurb_check_valid_v(struct Nurb *nu)
if (nu->pntsv < nu->orderv)
return false;
- if (((nu->flag & CU_NURB_CYCLIC) == 0) && (nu->flagv & CU_NURB_BEZIER)) { /* Bezier V Endpoints */
+ if (((nu->flagv & CU_NURB_CYCLIC) == 0) && (nu->flagv & CU_NURB_BEZIER)) { /* Bezier V Endpoints */
if (nu->orderv == 4) {
if (nu->pntsv < 5)
return false; /* bezier with 4 orderu needs 5 points */
More information about the Bf-blender-cvs
mailing list