From 45df259538c204540819d74456d30ffb40df488a Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaled@aliftype.com>
Date: Mon, 31 Jan 2022 23:06:10 +0200
Subject: [PATCH] 3.3.1

---
 NEWS             | 23 +++++++++++++++--------
 configure.ac     |  2 +-
 meson.build      |  2 +-
 src/hb-version.h |  4 ++--
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index c9ebb47e9..24deec4c3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,24 +1,31 @@
+Overview of changes leading to 3.3.1
+Monday, January 31, 2022
+====================================
+- Fix heap-use-after-free in harfbuzz-subset introduced in previous release.
+  (Garret Rieger)
+
+
 Overview of changes leading to 3.3.0
 Monday, January 31, 2022
 ====================================
-- Improved documentation.
-- Internal code cleanup, using C++ standard library more.
+- Improved documentation. (Matthias Clasen)
+- Internal code cleanup, using C++ standard library more. (Behdad Esfahbod)
 - The low 16-bits of face index will be used by hb_face_create() to select a
   face inside a font collection file format, while the high 16-bits will be
-  used by hb_font_create() to load the named instance.
+  used by hb_font_create() to load the named instance. (Behdad Esfahbod)
 - Glyph positions and other font metrics now apply synthetic slant set by
   hb_font_set_synthetic_slant(), for improved positioning for synthetically
-  slanted fonts.
+  slanted fonts. (Behdad Esfahbod)
 - Fixed unintentional locale dependency in hb_variation_to_string() for decimal
-  point representation.
+  point representation. (Matthias Clasen)
 - When applying pair positioning (kerning) the positioning value is split
   between the two sides of the pair for improved cursor positioning between
-  such pairs.
+  such pairs. (Behdad Esfahbod)
 - Introduced new HB_GLYPH_FLAG_UNSAFE_TO_CONCAT, to be used in conjunction
   with HB_GLYPH_FLAG_UNSAFE_TO_BREAK for optimizing re-shaping during line
-  breaking. Check the documentation for further details.
+  breaking. Check the documentation for further details. (Behdad Esfahbod)
 - Improved handling of macrolanguages when mapping BCP 47 codes to OpenType
-  tags.
+  tags. (David Corbett)
 
 - New API:
 +HB_GLYPH_FLAG_UNSAFE_TO_CONCAT
diff --git a/configure.ac b/configure.ac
index 03cfedc21..0f70ba19e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [3.3.0],
+        [3.3.1],
         [https://github.com/harfbuzz/harfbuzz/issues/new],
         [harfbuzz],
         [http://harfbuzz.org/])
diff --git a/meson.build b/meson.build
index 2b782cf62..476636490 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('harfbuzz', 'c', 'cpp',
   meson_version: '>= 0.55.0',
-  version: '3.3.0',
+  version: '3.3.1',
   default_options: [
     'cpp_rtti=false',       # Just to support msvc, we are passing -fno-exceptions also anyway
     'cpp_std=c++11',
diff --git a/src/hb-version.h b/src/hb-version.h
index 9a4f1b195..91ccb3dcd 100644
--- a/src/hb-version.h
+++ b/src/hb-version.h
@@ -53,14 +53,14 @@ HB_BEGIN_DECLS
  *
  * The micro component of the library version available at compile-time.
  */
-#define HB_VERSION_MICRO 0
+#define HB_VERSION_MICRO 1
 
 /**
  * HB_VERSION_STRING:
  *
  * A string literal containing the library version available at compile-time.
  */
-#define HB_VERSION_STRING "3.3.0"
+#define HB_VERSION_STRING "3.3.1"
 
 /**
  * HB_VERSION_ATLEAST: