Re: master 48af19c: Fix buffer overflow in ns_compute_glyph_string_overhangs

["Daniel Martín" <mardani29@yahoo.es>]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

Michael Albinus <michael.albinus@gmx.de> writes:

>
> This breaks the compilation on emba, see for example
> <https://emba.gnu.org/emacs/emacs/-/jobs/31765/raw>.
>
> Best regards, Michael.

Thanks for the report.  Does the attached patch solve the issue?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-GNUstep-build.patch --]
[-- Type: text/x-patch, Size: 1121 bytes --]

From 216fd1d886d3ff983ddf24ad056eab3cdbbbaa0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= <mardani29@yahoo.es>
Date: Fri, 5 Nov 2021 21:03:33 +0100
Subject: [PATCH] Fix GNUstep build

* src/nsterm.m (ns_compute_glyph_string_overhangs): Declare the font
variable so that it's in scope for the GNUstep code.
---
 src/nsterm.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index f3dd0d791c..54989a2373 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2849,12 +2849,13 @@ Hide the window (X11 semantics)
      External (RIF); compute left/right overhang of whole string and set in s
    -------------------------------------------------------------------------- */
 {
+  struct font *font = s->font;
+
   if (s->char2b)
     {
       struct font_metrics metrics;
       if (s->first_glyph->type == CHAR_GLYPH && !s->font_not_found_p)
         {
-          struct font *font = s->font;
           font->driver->text_extents (font, s->char2b, s->nchars, &metrics);
           s->left_overhang = -metrics.lbearing;
           s->right_overhang
-- 
2.31.0