[X2Go-Commits] [x2goclient] 26/139: x2goclient.cpp: fix failing exec() call for the UNIX helper utility: correctly terminate arguments vector.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 13 17:27:24 CET 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 54210f682b7d813f18f9cfda653eea1daa5b79c6
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Mar 20 04:02:06 2015 +0100
x2goclient.cpp: fix failing exec() call for the UNIX helper utility: correctly terminate arguments vector.
---
debian/changelog | 2 ++
src/x2goclient.cpp | 6 +-----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eeb0032..3aeb954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
parent PID polling.
- unixhelper.{cpp,h}: ignore SIGINT, SIGTERM, SIGPIPE, SIGQUIT, SIGUSR1
and SIGUSR2.
+ - x2goclient.cpp: fix failing exec() call for the UNIX helper utility:
+ correctly terminate arguments vector.
* debian/control:
- Change apache2-dev | libc6-dev build dependency back to apache2-dev
only. Otherwise, apache2-dev is not installed at all, even though
diff --git a/src/x2goclient.cpp b/src/x2goclient.cpp
index 92d614d..d8ae6fa 100644
--- a/src/x2goclient.cpp
+++ b/src/x2goclient.cpp
@@ -54,11 +54,7 @@ int fork_helper (int argc, char **argv) {
}
/* Add null pointer as last element. */
- {
- std::vector<char> *tmp = new (std::vector<char>) ();
- tmp->push_back (0);
- new_argv_c_str->push_back (&tmp->front ());
- }
+ new_argv_c_str->push_back (0);
if (0 != execv (new_argv_c_str->front (), &(new_argv_c_str->front ()))) {
std::cerr << "Failed to re-execute process as UNIX cleanup helper tool: " << std::strerror (errno) << "\n"
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list