Merge ~oddbloke/ubuntu/+source/tmux:lp1835439 into ubuntu/+source/tmux:ubuntu/bionic-devel

[Dan Watkins]

[Andreas Hasenack (ahasenack)]

- d/changelog correct for SRU
- bug has SRU template filled out

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Just noticed that update-maintainer wasn't run in the previous upload (to update d/control), could you please run it and include that change in this mp?

[Andreas Hasenack (ahasenack)]

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Sponsoring e81a8076730e30085e459930396cdfe98f3796d5

[Andreas Hasenack (ahasenack)]

Tagged and uploaded:

$ git push pkg upload/2.6-3ubuntu0.2
Enumerating objects: 25, done.
Counting objects: 100% (25/25), done.
Delta compression using up to 2 threads
Compressing objects: 100% (19/19), done.
Writing objects: 100% (19/19), 5.18 KiB | 1.29 MiB/s, done.
Total 19 (delta 11), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/tmux
 * [new tag] upload/2.6-3ubuntu0.2 -> upload/2.6-3ubuntu0.2

$ dput ubuntu ../tmux_2.6-3ubuntu0.2_source.changes
Checking signature on .changes
gpg: ../tmux_2.6-3ubuntu0.2_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../tmux_2.6-3ubuntu0.2.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading tmux_2.6-3ubuntu0.2.dsc: done.
  Uploading tmux_2.6-3ubuntu0.2.debian.tar.xz: done.
  Uploading tmux_2.6-3ubuntu0.2_source.buildinfo: done.
  Uploading tmux_2.6-3ubuntu0.2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 10e86fb..4602a9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tmux (2.6-3ubuntu0.2) bionic; urgency=medium
+
+  * d/p/tmux-format_expand-leak.patch: Do not leak memory when working out job
+    name in formats.  (LP: #1835439)
+  * Update maintainer to reflect Ubuntu delta.
+
+ -- Daniel Watkins <[e-mail]>  Thu, 04 Jul 2019 15:45:07 -0400
+
 tmux (2.6-3ubuntu0.1) bionic; urgency=medium
 
   * d/p/tmux-pane-border-status-leak.patch: Fixed memory leak in
diff --git a/debian/control b/debian/control
index 69370cf..6e0e4d7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: tmux
 Section: admin
 Priority: optional
-Maintainer: Romain Francoise <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Romain Francoise <[e-mail]>
 Build-Depends: debhelper (>= 8.9.4~),
                dh-autoreconf,
                dpkg-dev (>= 1.16.1~),
diff --git a/debian/patches/series b/debian/patches/series
index ca10374..87d4f66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 platform-quirks.diff
 tmux-pane-border-status-leak.patch
+tmux-format_expand-leak.patch
diff --git a/debian/patches/tmux-format_expand-leak.patch b/debian/patches/tmux-format_expand-leak.patch
new file mode 100644
index 0000000..e27b74a
--- /dev/null
+++ b/debian/patches/tmux-format_expand-leak.patch
@@ -0,0 +1,32 @@
+Description: Do not leak memory when working out job name in formats.
+Origin: upstream, https://github.com/tmux/tmux/commit/ab6f0bb3485f6626bad6f585e4d17059fe4f7152
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tmux/+bug/1835439
+Last-Update: 2019-07-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/format.c
++++ b/format.c
+@@ -1102,7 +1102,7 @@
+ char *
+ format_expand(struct format_tree *ft, const char *fmt)
+ {
+-	char		*buf, *out;
++	char		*buf, *out, *name;
+ 	const char	*ptr, *s, *saved = fmt;
+ 	size_t		 off, len, n, outlen;
+ 	int     	 ch, brackets;
+@@ -1141,8 +1141,11 @@
+ 
+ 			if (ft->flags & FORMAT_NOJOBS)
+ 				out = xstrdup("");
+-			else
+-				out = format_job_get(ft, xstrndup(fmt, n));
++			else {
++				name = xstrndup(fmt, n);
++				out = format_job_get(ft, name);
++				free(name);
++			}
+ 			outlen = strlen(out);
+ 
+ 			while (len - off < outlen + 1) {