From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 21 Dec 2005 08:24:13 +0000 (+0000)
Subject: [BZ #1960]
X-Git-Tag: cvs/fedora-glibc-20051221T0931~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87629a1c5044939820c1a78f7f097ebfe2d2b14b;p=platform%2Fupstream%2Fglibc.git

[BZ #1960]

2005-12-21  Ulrich Drepper  <drepper@redhat.com>
	[BZ #1960]
	* io/fts.c (fts_open): Avoid function call in MAX macro use.
---

diff --git a/ChangeLog b/ChangeLog
index ad9ed77..cb3fdf9 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 f0df56c..bf18299 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. */