From: Po Lu <luangruo@yahoo.com>
Date: Wed, 29 May 2024 09:11:11 +0000 (+0800)
Subject: Fix unsafe usage of string data on Android
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~1317
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b8d880e059252541be0017523fc1ffa2251bb542;p=emacs.git

Fix unsafe usage of string data on Android

* src/dired.c (open_directory): Reload name after calling
maybe_quit, which might invoke GC.
---

diff --git a/src/dired.c b/src/dired.c
index 37a9cad992f..884d5df2410 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -126,6 +126,10 @@ open_directory (Lisp_Object dirname, Lisp_Object encoded_dirname, int *fdp)
   else if (errno == EINTR)
     {
       maybe_quit ();
+
+      /* Reload the address of DIRNAME's data, as it might have been
+	 relocated by GC.  */
+      name = SSDATA (dirname);
       goto again;
     }
 #endif