findtextrel: do not use unbound alloca

This fixes the following compilation warning:

findtextrel.c:184:1: warning: stack usage might be unbounded [-Wstack-usage=]

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>

diff --git a/src/ChangeLog b/src/ChangeLog
index e8fce200bf0ace01baa1b759b86dc8c748549b39..87b3dd461b09ca89cd781adc3f7bbd7c844aec5d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2021-09-09  Dmitry V. Levin  <ldv@altlinux.org>
+
+       * findtextrel.c: Include "libeu.h".
+       (open_rootdir_file): New function.
+       (process_file): Use it to open file inside rootdir.
+       * Makefile.am (findtextrel_no_Wstack_usage): Remove.
+
 2021-09-06  Dmitry V. Levin  <ldv@altlinux.org>
 
        * objdump.c (show_disasm): Replace asprintf followed by

diff --git a/src/Makefile.am b/src/Makefile.am
index 86d5bcf84b712c02c2306dfacb4e897d1f0a28ec..6cc019da0856c39ee84ebad9480a643bba26cd25 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,7 +61,6 @@ nm_no_Wstack_usage = yes
 size_no_Wstack_usage = yes
 strip_no_Wstack_usage = yes
 elflint_no_Wstack_usage = yes
-findtextrel_no_Wstack_usage = yes
 elfcmp_no_Wstack_usage = yes
 objdump_no_Wstack_usage = yes
 ranlib_no_Wstack_usage = yes

diff --git a/src/findtextrel.c b/src/findtextrel.c
index 5d479b51527713648a225ed89be52ffa717b3eab..ecb1d11889fa85b02a6df0436c7ba6baa4693978 100644 (file)
--- a/src/findtextrel.c
+++ b/src/findtextrel.c
@@ -36,6 +36,7 @@
 #include <unistd.h>
 
 #include <printversion.h>
+#include "libeu.h"
 #include "system.h"
 
 struct segments
@@ -181,30 +182,31 @@ noop (void *arg __attribute__ ((unused)))
 
 
 static int
-process_file (const char *fname, bool more_than_one)
+open_rootdir_file (const char *fname)
 {
-  int result = 0;
-  void *knownsrcs = NULL;
-
-  size_t fname_len = strlen (fname);
-  size_t rootdir_len = strlen (rootdir);
+  char *new_fname = NULL;
   const char *real_fname = fname;
+
   if (fname[0] == '/' && (rootdir[0] != '/' || rootdir[1] != '\0'))
-    {
-      /* Prepend the user-provided root directory.  */
-      char *new_fname = alloca (rootdir_len + fname_len + 2);
-      *((char *) mempcpy (stpcpy (mempcpy (new_fname, rootdir, rootdir_len),
-                                 "/"),
-                         fname, fname_len)) = '\0';
-      real_fname = new_fname;
-    }
+    real_fname = new_fname = xasprintf ("%s/%s", rootdir, fname);
 
   int fd = open (real_fname, O_RDONLY);
   if (fd == -1)
-    {
-      error (0, errno, _("cannot open '%s'"), fname);
-      return 1;
-    }
+    error (0, errno, _("cannot open '%s'"), fname);
+
+  free (new_fname);
+  return fd;
+}
+
+
+static int
+process_file (const char *fname, bool more_than_one)
+{
+  int result = 0;
+  void *knownsrcs = NULL;
+  int fd = open_rootdir_file (fname);
+  if (fd == -1)
+    return 1;
 
   Elf *elf = elf_begin (fd, ELF_C_READ_MMAP, NULL);
   if (elf == NULL)
@@ -359,18 +361,10 @@ cannot get program header index at offset %zd: %s"),
         is specified with an absolute path.  */
       if (dw == NULL && fname[0] == '/')
        {
-         size_t debuginfo_rootlen = strlen (debuginfo_root);
-         char *difname = (char *) alloca (rootdir_len + debuginfo_rootlen
-                                          + fname_len + 8);
-         strcpy (mempcpy (stpcpy (mempcpy (mempcpy (difname, rootdir,
-                                                    rootdir_len),
-                                           debuginfo_root,
-                                           debuginfo_rootlen),
-                                  "/"),
-                          fname, fname_len),
-                 ".debug");
-
+         char *difname =
+           xasprintf("%s%s/%s.debug", rootdir, debuginfo_root, fname);
          fd2 = open (difname, O_RDONLY);
+         free (difname);
          if (fd2 != -1
              && (elf2 = elf_begin (fd2, ELF_C_READ_MMAP, NULL)) != NULL)
            dw = dwarf_begin_elf (elf2, DWARF_C_READ, NULL);