From: Po Lu <luangruo@yahoo.com>
Date: Mon, 27 Mar 2023 10:22:23 +0000 (+0800)
Subject: Update Android port
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee9c0a482c86cab33ef149829ea02857bcdd9d8c;p=emacs.git

Update Android port

* src/sfnt.c (sfnt_normalize_blend): Don't crash when axis
variations are not present.
---

diff --git a/src/sfnt.c b/src/sfnt.c
index 99649698557..f6730857f86 100644
--- a/src/sfnt.c
+++ b/src/sfnt.c
@@ -13582,7 +13582,8 @@ sfnt_normalize_blend (struct sfnt_blend *blend)
   /* Now, apply axis variations, but only if the avar table has the
      right number of axes.  */
 
-  if (blend->fvar->axis_count == blend->avar->axis_count)
+  if (blend->avar && (blend->fvar->axis_count
+		      == blend->avar->axis_count))
     {
       for (i = 0; i < blend->fvar->axis_count; ++i)
 	{