summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGard Spreemann <gspr@nonempty.org>2023-06-08 11:30:36 +0200
committerGard Spreemann <gspr@nonempty.org>2023-06-08 11:30:36 +0200
commitfe7a6dc056597947543b55256b07cb2132d99e82 (patch)
tree4676500e2faf2603cf5802528a2b0f65cd12c83c
parent1a5ead938488d53c075330194f2a7d437729677e (diff)
Drop upstreamed patch
-rw-r--r--debian/patches/0001-Fix-a-memory-leak.patch29
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 30 deletions
diff --git a/debian/patches/0001-Fix-a-memory-leak.patch b/debian/patches/0001-Fix-a-memory-leak.patch
deleted file mode 100644
index 9049ffd..0000000
--- a/debian/patches/0001-Fix-a-memory-leak.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Gard Spreemann <gspr@nonempty.org>
-Date: Mon, 10 Apr 2023 12:21:18 +0200
-Subject: Fix a memory leak
-
-This cherry-picks upstream commit
-9070c4c527c906cb186588ca410d92d2f7f3c7ba. The original commit message
-follows.
-
-This was introduced by a0f6bfa191f55b99e4ff68dd0063aa0c0e12dcbd
-incorrectly checking when to increase the value of
-cxs->last_confirmed_msgno. As a result, one of the two Waypipe
-processes would leak all the messages sent to the other process.
----
- src/mainloop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mainloop.c b/src/mainloop.c
-index 181319c..38a084d 100644
---- a/src/mainloop.c
-+++ b/src/mainloop.c
-@@ -280,7 +280,7 @@ static int interpret_chanmsg(struct chan_msg_state *cmsg,
- } else if (type == WMSG_ACK_NBLOCKS) {
- struct wmsg_ack *ackm = (struct wmsg_ack *)packet;
- if (msgno_gt(ackm->messages_received,
-- cxs->last_received_msgno)) {
-+ cxs->last_confirmed_msgno)) {
- cxs->last_confirmed_msgno = ackm->messages_received;
- }
- return 0;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cd3504b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-a-memory-leak.patch