mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Fix a problem with gmake segfaulting with some locales.
PR: 41075 Submitted by: naddy
This commit is contained in:
parent
c0f6e1f448
commit
c20a8be843
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=65538
4 changed files with 38 additions and 6 deletions
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= gmake
|
||||
PORTVERSION= 3.79.1
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= make
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
|
||||
$FreeBSD$
|
||||
|
||||
--- gettext.c 2002/06/06 22:10:23 1.1
|
||||
+++ gettext.c 2002/06/06 22:11:09
|
||||
--- gettext.c.orig Wed Feb 9 08:02:18 2000
|
||||
+++ gettext.c Sun Jul 28 04:22:31 2002
|
||||
@@ -22,6 +22,10 @@
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
@ -14,3 +14,19 @@ $FreeBSD$
|
|||
#ifdef __GNUC__
|
||||
# define alloca __builtin_alloca
|
||||
# define HAVE_ALLOCA 1
|
||||
@@ -1294,6 +1298,15 @@
|
||||
{
|
||||
FREE_BLOCKS (block_list);
|
||||
return added;
|
||||
+ }
|
||||
+ if (string_space != new_pool)
|
||||
+ {
|
||||
+ size_t i;
|
||||
+ for (i = 0; i < nmap; i++)
|
||||
+ {
|
||||
+ map[i].alias += new_pool - string_space;
|
||||
+ map[i].value += new_pool - string_space;
|
||||
+ }
|
||||
}
|
||||
string_space = new_pool;
|
||||
string_space_max = new_size;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= gmake
|
||||
PORTVERSION= 3.79.1
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= make
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
|
||||
$FreeBSD$
|
||||
|
||||
--- gettext.c 2002/06/06 22:10:23 1.1
|
||||
+++ gettext.c 2002/06/06 22:11:09
|
||||
--- gettext.c.orig Wed Feb 9 08:02:18 2000
|
||||
+++ gettext.c Sun Jul 28 04:22:31 2002
|
||||
@@ -22,6 +22,10 @@
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
@ -14,3 +14,19 @@ $FreeBSD$
|
|||
#ifdef __GNUC__
|
||||
# define alloca __builtin_alloca
|
||||
# define HAVE_ALLOCA 1
|
||||
@@ -1294,6 +1298,15 @@
|
||||
{
|
||||
FREE_BLOCKS (block_list);
|
||||
return added;
|
||||
+ }
|
||||
+ if (string_space != new_pool)
|
||||
+ {
|
||||
+ size_t i;
|
||||
+ for (i = 0; i < nmap; i++)
|
||||
+ {
|
||||
+ map[i].alias += new_pool - string_space;
|
||||
+ map[i].value += new_pool - string_space;
|
||||
+ }
|
||||
}
|
||||
string_space = new_pool;
|
||||
string_space_max = new_size;
|
||||
|
|
Loading…
Add table
Reference in a new issue