From 75a7a2a36a02066cf51bf8055318b5efbcb9022d Mon Sep 17 00:00:00 2001
From: Dmitri Tikhonov <dtikhonov@litespeedtech.com>
Date: Thu, 7 Nov 2019 09:03:36 -0500
Subject: [PATCH] Release 2.5.2

- [BUGFIX] argument order to gQUIC client constructor.  Regression
  introduced in 2.5.0.
- [BUGFIX] split buffered packet error recovery: destroy the correct
  packet.
---
 CHANGELOG                       | 7 +++++++
 include/lsquic.h                | 2 +-
 src/liblsquic/lsquic_engine.c   | 4 ++--
 src/liblsquic/lsquic_send_ctl.c | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ec0f144..9941247 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+2019-11-07
+    - 2.5.2
+    - [BUGFIX] argument order to gQUIC client constructor.  Regression
+      introduced in 2.5.0.
+    - [BUGFIX] split buffered packet error recovery: destroy the correct
+      packet.
+
 2019-11-04
     - 2.5.1
     - [BUGFIX] Fix double-free when emptying a packet number space.
diff --git a/include/lsquic.h b/include/lsquic.h
index 5e86631..97c5dc7 100644
--- a/include/lsquic.h
+++ b/include/lsquic.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #define LSQUIC_MAJOR_VERSION 2
 #define LSQUIC_MINOR_VERSION 5
-#define LSQUIC_PATCH_VERSION 1
+#define LSQUIC_PATCH_VERSION 2
 
 /**
  * Engine flags:
diff --git a/src/liblsquic/lsquic_engine.c b/src/liblsquic/lsquic_engine.c
index d6c443c..8eb8f63 100644
--- a/src/liblsquic/lsquic_engine.c
+++ b/src/liblsquic/lsquic_engine.c
@@ -1516,8 +1516,8 @@ lsquic_engine_connect (lsquic_engine_t *engine, enum lsquic_version version,
                     flags, hostname, max_packet_size,
                     is_ipv4, zero_rtt, zero_rtt_len, token, token_sz);
     else
-        conn = lsquic_gquic_full_conn_client_new(&engine->pub, flags,
-                            versions, hostname, max_packet_size, is_ipv4,
+        conn = lsquic_gquic_full_conn_client_new(&engine->pub, versions,
+                            flags, hostname, max_packet_size, is_ipv4,
                             zero_rtt, zero_rtt_len);
     if (!conn)
         goto err;
diff --git a/src/liblsquic/lsquic_send_ctl.c b/src/liblsquic/lsquic_send_ctl.c
index 7f11ca8..e8cb81d 100644
--- a/src/liblsquic/lsquic_send_ctl.c
+++ b/src/liblsquic/lsquic_send_ctl.c
@@ -2418,7 +2418,7 @@ split_buffered_packet (lsquic_send_ctl_t *ctl,
     }
     else
     {
-        send_ctl_destroy_packet(ctl, packet_out);
+        send_ctl_destroy_packet(ctl, new_packet_out);
         return -1;
     }
 }