Patch a segfault.
Issue #1487 and #1501, pointed out by oden dot eriksson at vattenfall dot com.
This commit is contained in:
parent
800dde62a0
commit
8cd3c1ad8e
27
xrdp-0.9.12-segfault.patch
Normal file
27
xrdp-0.9.12-segfault.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 72bece526bb5863d99a52546374c0c3b1561a61a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Derek Schrock <dereks@lifeofadishwasher.com>
|
||||||
|
Date: Mon, 27 Jan 2020 21:11:38 -0500
|
||||||
|
Subject: [PATCH] return from xfs_delete_xfs_fs if NULL
|
||||||
|
|
||||||
|
---
|
||||||
|
sesman/chansrv/chansrv_xfs.c | 7 ++++++-
|
||||||
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/sesman/chansrv/chansrv_xfs.c b/sesman/chansrv/chansrv_xfs.c
|
||||||
|
index a63c1604b..feff7e2b3 100644
|
||||||
|
--- a/sesman/chansrv/chansrv_xfs.c
|
||||||
|
+++ b/sesman/chansrv/chansrv_xfs.c
|
||||||
|
@@ -387,7 +387,12 @@ xfs_create_xfs_fs(mode_t umask, uid_t uid, gid_t gid)
|
||||||
|
void
|
||||||
|
xfs_delete_xfs_fs(struct xfs_fs *xfs)
|
||||||
|
{
|
||||||
|
- if (xfs != NULL && xfs->inode_table != NULL)
|
||||||
|
+ if (xfs == NULL)
|
||||||
|
+ {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (xfs->inode_table != NULL)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
for (i = 0 ; i < xfs->inode_count; ++i)
|
@ -13,7 +13,7 @@ Summary: Open source remote desktop protocol (RDP) server
|
|||||||
Name: xrdp
|
Name: xrdp
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 0.9.12
|
Version: 0.9.12
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
License: ASL 2.0 and GPLv2+ and MIT
|
License: ASL 2.0 and GPLv2+ and MIT
|
||||||
URL: http://www.xrdp.org/
|
URL: http://www.xrdp.org/
|
||||||
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%{version}.tar.gz
|
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%{version}.tar.gz
|
||||||
@ -30,6 +30,7 @@ Patch2: xrdp-0.9.4-service.patch
|
|||||||
Patch3: xrdp-0.9.2-setpriv.patch
|
Patch3: xrdp-0.9.2-setpriv.patch
|
||||||
Patch4: xrdp-0.9.10-scripts-libexec.patch
|
Patch4: xrdp-0.9.10-scripts-libexec.patch
|
||||||
Patch5: xrdp-0.9.6-script-interpreter.patch
|
Patch5: xrdp-0.9.6-script-interpreter.patch
|
||||||
|
Patch6: xrdp-0.9.12-segfault.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: libX11-devel
|
BuildRequires: libX11-devel
|
||||||
@ -273,6 +274,10 @@ fi
|
|||||||
%{_datadir}/selinux/*/%{name}.pp
|
%{_datadir}/selinux/*/%{name}.pp
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 22 2020 Tom Callaway <bojan@rexursive.com> - 1:0.9.12-6
|
||||||
|
- patch a segfault
|
||||||
|
- issue #1487 and #1501, pointed out by oden dot eriksson at vattenfall dot com
|
||||||
|
|
||||||
* Thu Feb 20 2020 Tom Callaway <spot@fedoraproject.org> - 1:0.9.12-5
|
* Thu Feb 20 2020 Tom Callaway <spot@fedoraproject.org> - 1:0.9.12-5
|
||||||
- fix license tag (bz1804932)
|
- fix license tag (bz1804932)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user