pool/qalculate
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 605327 from KDE:Distro:Factory

Browse Source 
- Add patch to fix FD leak (boo#1092329):
  * 0001-Fix-leaking-of-FDs-created-by-pipe.patch

OBS-URL: https://build.opensuse.org/request/show/605327
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qalculate?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger 2018-05-11 09:28:08 +00:00 committed by Git OBS Bridge
parent a1218adc33
commit 9a64485bf9
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-Fix-leaking-of-FDs-created-by-pipe.patch Normal file
View File

@ -0,0 +1,34 @@
From 34d7203c5b5c45d2140d01cd7131e51c3f9ef570 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 8 May 2018 14:11:47 +0200
Subject: [PATCH] Fix leaking of FDs created by pipe
Use pipe2 to pass O_CLOEXEC.
---
libqalculate/util.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libqalculate/util.cc b/libqalculate/util.cc
index a1d29b7..8ee8bcf 100644
--- a/libqalculate/util.cc
+++ b/libqalculate/util.cc
@@ -38,6 +38,7 @@
# include <initguid.h>
# include <shlobj.h>
#else
+# include <fcntl.h>
# include <utime.h>
# include <unistd.h>
# include <pwd.h>
@@ -834,7 +835,7 @@ bool Thread::cancel() {
Thread::Thread() : running(false), m_pipe_r(NULL), m_pipe_w(NULL) {
pthread_attr_init(&m_thread_attr);
int pipe_wr[] = {0, 0};
- if(pipe(pipe_wr) == 0) {
+ if(pipe2(pipe_wr, O_CLOEXEC) == 0) {
m_pipe_r = fdopen(pipe_wr[0], "r");
m_pipe_w = fdopen(pipe_wr[1], "w");
}
--
2.16.2

6
qalculate.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 8 12:26:36 UTC 2018 - fabian@ritter-vogt.de
- Add patch to fix FD leak (boo#1092329):
* 0001-Fix-leaking-of-FDs-created-by-pipe.patch
-------------------------------------------------------------------
Sat Mar 10 16:53:35 UTC 2018 - fabian@ritter-vogt.de

3
qalculate.spec
View File

@ -26,6 +26,8 @@ License: GPL-2.0+
Group: Productivity/Scientific/Math
Url: https://qalculate.github.io/
Source: https://github.com/Qalculate/libqalculate/releases/download/v%{version}/%{libname}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM (https://github.com/Qalculate/libqalculate/pull/87)
Patch1: 0001-Fix-leaking-of-FDs-created-by-pipe.patch
BuildRequires: gcc-c++
BuildRequires: gmp-devel
BuildRequires: intltool
@ -72,6 +74,7 @@ you will need to install %{libname}-devel.
%prep
%setup -q -n %{libname}-%{version}
%autopatch -p1
%build
%configure --disable-static