OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[BZ #1960] 

2005-12-21  Ulrich Drepper  <drepper@redhat.com>
	[BZ #1960]
	* io/fts.c (fts_open): Avoid function call in MAX macro use.
This commit is contained in:
Ulrich Drepper 2005-12-21 08:24:13 +00:00
parent 4b5b009cc3
commit 87629a1c50
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-12-21 Ulrich Drepper <drepper@redhat.com>
[BZ #1960]
* io/fts.c (fts_open): Avoid function call in MAX macro use.
2005-12-20 Ulrich Drepper <drepper@redhat.com>
* locale/xlocale.c (_nl_C_locobj): Mark as const.

3
io/fts.c
View File

@ -120,7 +120,8 @@ fts_open(argv, options, compar)
#ifndef MAXPATHLEN
#define MAXPATHLEN 1024
#endif
if (fts_palloc(sp, MAX(fts_maxarglen(argv), MAXPATHLEN)))
size_t maxarglen = fts_maxarglen(argv);
if (fts_palloc(sp, MAX(maxarglen, MAXPATHLEN)))
goto mem1;
/* Allocate/initialize root's parent. */