Update to 0.9.22.1.

This commit is contained in:
Bojan Smojver 2023-05-23 11:18:19 +10:00
parent 7a1d427dc2
commit 8abd3891e4
4 changed files with 7 additions and 64 deletions

1
.gitignore vendored
View File

@ -26,3 +26,4 @@ xrdp-cvs-03-17-2010.tar.gz
/xrdp-0.9.20.tar.gz
/xrdp-0.9.21.tar.gz
/xrdp-0.9.22.tar.gz
/xrdp-0.9.22.1.tar.gz

View File

@ -1 +1 @@
SHA512 (xrdp-0.9.22.tar.gz) = 9bef87d7fdf1fe0321c5091471f17b3148891a7ef9036ec08f84e4193b4ccb104879e2fcb556672f50d1f6d0e2c49e6193d142ff3ec756b20bc3929b928dfe78
SHA512 (xrdp-0.9.22.1.tar.gz) = a96f261bf9e3ecadbc305d265fb3384f4378627c1e518febd7a12e830218d73ff107615bfb591901f0b9c241203c14c9392dbd2dde053f687685af8961891d5f

View File

@ -1,60 +0,0 @@
From 8810d46ff11795af2977c54a83d16e5cf1a2ad2a Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Mon, 6 Mar 2023 15:42:33 +0000
Subject: [PATCH] Fix regression in list module
---
common/list.c | 13 ++++++-------
tests/common/test_list_calls.c | 5 +++++
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/common/list.c b/common/list.c
index 83fde45a2..c23acb756 100644
--- a/common/list.c
+++ b/common/list.c
@@ -205,6 +205,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)
{
@@ -220,16 +221,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;
}
diff --git a/tests/common/test_list_calls.c b/tests/common/test_list_calls.c
index af6f41c22..aa098b61a 100644
--- a/tests/common/test_list_calls.c
+++ b/tests/common/test_list_calls.c
@@ -43,6 +43,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);

View File

@ -16,8 +16,8 @@
Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.22
Release: 5%{?dist}
Version: 0.9.22.1
Release: 1%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%{version}.tar.gz
@ -38,7 +38,6 @@ Patch6: xrdp-0.9.18-vnc-uninit.patch
%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
Patch7: xrdp-0.9.20-sesman-ini.patch
%endif
Patch8: xrdp-0.9.22-chooser-segfault.patch
BuildRequires: make
BuildRequires: gcc
@ -290,6 +289,9 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
* Tue May 23 2023 Bojan Smojver <bojan@rexursive.com> - 1:0.9.22.1-1
- Update to 0.9.22.1
* Fri May 19 2023 Bojan Smojver <bojan@rexursive.com> - 1:0.9.22-5
- Patch session chooser segfault
- Bugs #2208015 and #2208248