[Bf-blender-cvs] [d38023f2f38] master: fix (unreported): Weld Modifier: possible use of uninitialized variable

Germano Cavalcante noreply at git.blender.org
Fri Apr 3 20:09:14 CEST 2020


Commit: d38023f2f38ccfc81a1c0394b0982514df352b3c
Author: Germano Cavalcante
Date:   Fri Apr 3 15:08:54 2020 -0300
Branches: master
https://developer.blender.org/rBd38023f2f38ccfc81a1c0394b0982514df352b3c

fix (unreported): Weld Modifier: possible use of uninitialized variable

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

M	source/blender/modifiers/intern/MOD_weld.c

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

diff --git a/source/blender/modifiers/intern/MOD_weld.c b/source/blender/modifiers/intern/MOD_weld.c
index a7d3280b113..90b71b2d504 100644
--- a/source/blender/modifiers/intern/MOD_weld.c
+++ b/source/blender/modifiers/intern/MOD_weld.c
@@ -800,6 +800,8 @@ static bool weld_iter_loop_of_poly_begin(WeldLoopOfPolyIter *iter,
   iter->mloop = mloop;
   iter->loop_map = loop_map;
   iter->group = group_buffer;
+
+  uint group_len = 0;
   if (group_buffer) {
     /* First loop group needs more attention. */
     uint loop_start, loop_end, l;
@@ -817,16 +819,14 @@ static bool weld_iter_loop_of_poly_begin(WeldLoopOfPolyIter *iter,
       break;
     }
     if (l != loop_end) {
-      iter->group_len = iter->loop_end - l;
+      group_len = loop_end - l;
       int i = 0;
       while (l < loop_end) {
         iter->group[i++] = ++l;
       }
     }
   }
-  else {
-    iter->group_len = 0;
-  }
+  iter->group_len = group_len;
 
   iter->l_next = iter->loop_start;
 #ifdef USE_WELD_DEBUG



More information about the Bf-blender-cvs mailing list