diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-12-21 08:24:13 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-12-21 08:24:13 +0000 |
| commit | 87629a1c5044939820c1a78f7f097ebfe2d2b14b (patch) | |
| tree | 70658ff18d2eb8a6f7ccb1babe483b9e8c0ef254 | |
| parent | 4b5b009cc3045ca026b061ce55160bd1eeb0888c (diff) | |
| download | glibc-87629a1c5044939820c1a78f7f097ebfe2d2b14b.tar.gz glibc-87629a1c5044939820c1a78f7f097ebfe2d2b14b.tar.xz glibc-87629a1c5044939820c1a78f7f097ebfe2d2b14b.zip | |
[BZ #1960]
2005-12-21 Ulrich Drepper <drepper@redhat.com> [BZ #1960] * io/fts.c (fts_open): Avoid function call in MAX macro use.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | io/fts.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index ad9ed77a11..cb3fdf91b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/io/fts.c b/io/fts.c index f0df56cc7b..bf182992c2 100644 --- a/io/fts.c +++ b/io/fts.c @@ -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. */ |