From 9c1a2b043925a99c9e92ba11ef7824dcfe4ff942 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Tue, 22 Dec 2015 12:05:46 +0100
Subject: [PATCH] * src/type1/t1load.c (parse_subrs): Fix memory leak (#46744).

---
 ChangeLog          | 4 ++++
 src/type1/t1load.c | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9d44af96e..489a583ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-22  Werner Lemberg  <wl@gnu.org>
+
+	* src/type1/t1load.c (parse_subrs): Fix memory leak (#46744).
+
 2015-12-22  Werner Lemberg  <wl@gnu.org>
 
 	[base] Make hash interface symmetric.
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 1a569800c..08bb659cb 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -1462,6 +1462,8 @@
         if ( FT_NEW( hash ) )
           goto Fail;
 
+        loader->subrs_hash = hash;
+
         error = ft_hash_num_init( hash, memory );
         if ( error )
           goto Fail;
@@ -1571,10 +1573,7 @@
     }
 
     if ( !loader->num_subrs )
-    {
-      loader->num_subrs  = num_subrs;
-      loader->subrs_hash = hash;
-    }
+      loader->num_subrs = num_subrs;
 
     return;