[Asterisk-code-review] vector: After remove element recheck index (asterisk[14])

[Badalian Vyacheslav]

Badalian Vyacheslav has uploaded a new change for review.

  https://gerrit.asterisk.org/4066

Change subject: vector: After remove element recheck index
......................................................................

vector: After remove element recheck index

Small fix. It is necessary to double-check
the index that we just removed because there
is a new element.

ASTERISK-26453 #close

Change-Id: Ib947fa94dc91dcd9341f357f1084782c64434eb7
---
M include/asterisk/vector.h
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/66/4066/1

diff --git a/include/asterisk/vector.h b/include/asterisk/vector.h
index b4a8a2c..cff9fd1 100644
--- a/include/asterisk/vector.h
+++ b/include/asterisk/vector.h
@@ -371,6 +371,9 @@
 		if (cmp((vec)->elems[idx], __value)) {			\
 			cleanup((vec)->elems[idx]);			\
 			AST_VECTOR_REMOVE_UNORDERED((vec), idx);	\
+			if (idx > 0) {					\
+				--idx;					\
+			}						\
 			++count;					\
 		}							\
 	}								\
@@ -420,7 +423,10 @@
 	for (idx = 0; idx < (vec)->current; ++idx) {			\
 		if (cmp((vec)->elems[idx], __value)) {			\
 			cleanup((vec)->elems[idx]);			\
-			AST_VECTOR_REMOVE_ORDERED((vec), idx);	\
+			AST_VECTOR_REMOVE_ORDERED((vec), idx);		\
+			if (idx > 0) {					\
+				--idx;					\
+			}						\
 			++count;					\
 		}							\
 	}								\
@@ -445,7 +451,7 @@
 	for (idx = 0; idx < (vec)->current; ++idx) {			\
 		if (cmp((vec)->elems[idx], __value)) {			\
 			cleanup((vec)->elems[idx]);			\
-			AST_VECTOR_REMOVE_ORDERED((vec), idx);	\
+			AST_VECTOR_REMOVE_ORDERED((vec), idx);		\
 			res = 0;					\
 			break;						\
 		}							\

-- 
To view, visit https://gerrit.asterisk.org/4066
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib947fa94dc91dcd9341f357f1084782c64434eb7
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 14
Gerrit-Owner: Badalian Vyacheslav <v.badalyan at open-bs.ru>