[tmux] Fix rhbz #1069950, upstream [tmux:tickets] #105

Filipe Rosset filiperosset at fedoraproject.org
Wed Feb 26 13:05:43 UTC 2014


commit 9722a8b6cd2bc711b84c52cb895336f4ffe0e52b
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Wed Feb 26 10:06:30 2014 -0300

    Fix rhbz #1069950, upstream [tmux:tickets] #105

 tmux-fix-malloc-check-error.patch |   12 ++++++++++++
 tmux.spec                         |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/tmux-fix-malloc-check-error.patch b/tmux-fix-malloc-check-error.patch
new file mode 100644
index 0000000..2ae549d
--- /dev/null
+++ b/tmux-fix-malloc-check-error.patch
@@ -0,0 +1,12 @@
+--- cmd.c-orig	2014-02-26 09:57:06.441154327 -0300
++++ cmd.c	2014-02-26 09:58:00.631888951 -0300
+@@ -138,6 +138,9 @@
+ 	size_t	arglen;
+ 	int	i;
+ 
++	if (argc == 0)
++		return (0);
++
+ 	*buf = '\0';
+ 	for (i = 0; i < argc; i++) {
+ 		if (strlcpy(buf, argv[i], len) >= len)
diff --git a/tmux.spec b/tmux.spec
index 076d9d3..7c196d9 100644
--- a/tmux.spec
+++ b/tmux.spec
@@ -1,6 +1,6 @@
 Name:           tmux
 Version:        1.9a
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A terminal multiplexer
 
 Group:          Applications/System
@@ -9,6 +9,7 @@ Group:          Applications/System
 License:        ISC and BSD
 URL:            http://sourceforge.net/projects/tmux
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         tmux-fix-malloc-check-error.patch
 
 BuildRequires:  ncurses-devel
 BuildRequires:  libevent-devel
@@ -21,6 +22,7 @@ as GNU Screen.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -54,6 +56,9 @@ fi
 %{_mandir}/man1/tmux.1.*
 
 %changelog
+* Wed Feb 26 2014 Filipe Rosset <rosset.filipe at gmail.com> 1.9a-2
+- Fix rhbz #1069950, upstream [tmux:tickets] #105
+
 * Sun Feb 23 2014 Filipe Rosset <rosset.filipe at gmail.com> 1.9a-1
 - New upstream release 1.9a
 


More information about the scm-commits mailing list