Browse Source

Clear memory in smartlist_remove_keeporder.

The smartlist functions take great care to reset unused pointers inside
the smartlist memory to NULL.

The function smartlist_remove_keeporder does not clear memory in such
way when elements have been removed. Therefore call memset after the
for-loop that removes elements. If no element is removed, it is
effectively a no-op.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Tobias Stoeckmann 6 years ago
parent
commit
670d0f9f5b
2 changed files with 6 additions and 0 deletions
  1. 4 0
      changes/ticket30176
  2. 2 0
      src/lib/smartlist_core/smartlist_core.c

+ 4 - 0
changes/ticket30176

@@ -0,0 +1,4 @@
+  o Minor features (defense in depth):
+    - In smartlist_remove_keeporder(), set any pointers that become
+      unused to NULL, in case a bug causes them to be used later. Closes
+      ticket 30176.  Patch from Tobias Stoeckmann.

+ 2 - 0
src/lib/smartlist_core/smartlist_core.c

@@ -177,6 +177,8 @@ smartlist_remove_keeporder(smartlist_t *sl, const void *element)
       sl->list[i++] = sl->list[j];
       sl->list[i++] = sl->list[j];
     }
     }
   }
   }
+  memset(sl->list + sl->num_used, 0,
+         sizeof(void *) * (num_used_orig - sl->num_used));
 }
 }
 
 
 /** If <b>sl</b> is nonempty, remove and return the final element.  Otherwise,
 /** If <b>sl</b> is nonempty, remove and return the final element.  Otherwise,