From 54e15c89dbb0806a6924b0e573fc64a2a839c2fb Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 22 Apr 2016 17:11:09 -0400
Subject: [PATCH] tst-fmon/tst-numeric: switch malloc to static stack space [BZ
#19671]
The current test code doesn't check the return value of malloc.
This should rarely (if ever) cause a problem, but rather than add
some return value checks, just statically allocate the buffer on
the stack. This will never fail (or if it does, we've got much
bigger problems that don't matter to the test).
---
localedata/tst-fmon.c | 4 ++--
localedata/tst-numeric.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
@@ -40,7 +40,7 @@
int
main (int argc, char *argv[])
{
- char *s = malloc (201);
+ char s[200];
if (setlocale (LC_MONETARY, argv[1]) == NULL)
{
@@ -48,7 +48,7 @@ main (int argc, char *argv[])
exit (EXIT_SETLOCALE);
}
- if (strfmon (s, 200, argv[2], (double) atof (argv[3])) == -1)
+ if (strfmon (s, sizeof (s), argv[2], (double) atof (argv[3])) == -1)
{
perror ("strfmon");
exit (EXIT_STRFMON);
@@ -41,7 +41,7 @@
int
main (int argc, char *argv[])
{
- char *s = malloc (201);
+ char s[200];
double val;
/* Make sure to read the value before setting of the locale, as
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
exit (EXIT_SETLOCALE);
}
- if (snprintf (s, 200, argv[2], val) == -1)
+ if (snprintf (s, sizeof (s), argv[2], val) == -1)
{
perror ("snprintf");
exit (EXIT_SNPRINTF);
--
2.7.4