From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 27 Jul 2001 03:48:11 +0000 (+0000)
Subject: (_dl_important_hwcaps): Avoid using malloc early in the program.
X-Git-Tag: cvs/glibc-2_2_4~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=821563a985e1de6923aa6a94555944e2e833937d;p=thirdparty%2Fglibc.git

(_dl_important_hwcaps): Avoid using malloc early in the program.
---

diff --git a/elf/dl-support.c b/elf/dl-support.c
index 09822218eb6..cd56ed411fd 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -187,16 +187,12 @@ internal_function
 _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
 		      size_t *max_capstrlen)
 {
-  struct r_strlenpair *result;
+  static struct r_strlenpair result;
+  static char buf[1];
 
-  /* XXX We don't try to find the capabilities in this case.  */
-  result = (struct r_strlenpair *) malloc (sizeof (*result));
-  if (result == NULL)
-    _dl_signal_error (ENOMEM, NULL, N_("cannot create capability list"));
-
-  result[0].str = (char *) result;	/* Does not really matter.  */
-  result[0].len = 0;
+  result.str = buf;	/* Does not really matter.  */
+  result.len = 0;
 
   *sz = 1;
-  return result;
+  return &result;
 }