Re: server.el test failures (was: Re: bug#9800: Incomplete truncated file buffers from the /proc filesystem)

[Jim Porter <jporterbugs@gmail.com>]

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

On 2/23/2023 7:25 PM, Po Lu wrote:
> Please remove the redundant braces after ``if (noninteractive)''.  Thanks.

Oh yeah. I had some vague recollection that Emacs preferred braces 
there, but I'm clearly confusing it with another project. Fixed.

[-- Attachment #2: 0001-Fix-segmentation-fault-when-merging-faces-in-a-nonin.patch --]
[-- Type: text/plain, Size: 1075 bytes --]

From df374dc2053b193b5c98c36e3ddd4c38e45f23b8 Mon Sep 17 00:00:00 2001
From: Jim Porter <jporterbugs@gmail.com>
Date: Thu, 23 Feb 2023 18:16:28 -0800
Subject: [PATCH] Fix segmentation fault when merging faces in a noninteractive
 Emacs

* src/xfaces.c (internal-merge-in-global-face): Signal an error when
'noninteractive' is true.
---
 src/xfaces.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/xfaces.c b/src/xfaces.c
index 62d7823f308..e1900f4cedb 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4162,6 +4162,11 @@ DEFUN ("internal-merge-in-global-face", Finternal_merge_in_global_face,
   Lisp_Object global_lface, local_lface, *gvec, *lvec;
   struct frame *f = XFRAME (frame);
 
+  /* If this process is noninteractive, we likely don't have a face
+     cache, so attempts to use it below would segfault.  */
+  if (noninteractive)
+    error ("Attempt to merge faces in noninteractive Emacs");
+
   CHECK_LIVE_FRAME (frame);
   global_lface = lface_from_face_name (NULL, face, true);
   local_lface = lface_from_face_name (f, face, false);
-- 
2.25.1