mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2575 from matt335672/fix_list_insert_bug

Browse Source 
Fix regression in list module
This commit is contained in:
matt335672 2023-03-06 15:57:25 +00:00 committed by GitHub
commit a6995f5e58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/list.c
View File

@ -204,6 +204,7 @@ list_remove_item(struct list *self, int index)
int
list_insert_item(struct list *self, int index, tbus item)
{
int i;
if (index > self->count)
{
@ -219,16 +220,14 @@ list_insert_item(struct list *self, int index, tbus item)
return 0;
}
self->count++;
if (self->count >= 2)
// Move all the items above this location up one
for (i = self->count ; i > index ; --i)
{
unsigned int i;
for (i = (self->count - 2); i >= (unsigned int)index; i--)
{
self->items[i + 1] = self->items[i];
}
self->items[i] = self->items[i - 1];
}
self->count++;
self->items[index] = item;
return 1;
}

5
tests/common/test_list_calls.c
View File

@ -42,6 +42,11 @@ START_TEST(test_list__simple)
val = list_get_item(lst, 10);
ck_assert_int_eq(val, 10);
list_insert_item(lst, 0, 99);
ck_assert_int_eq(lst->count, TEST_LIST_SIZE + 1);
val = list_get_item(lst, 10);
ck_assert_int_eq(val, 9);
list_clear(lst);
ck_assert_int_eq(lst->count, 0);
list_delete(lst);