From 38b23bc3f02ec199370865be9bd970e6318fa1d2 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sat, 13 Jun 2009 22:47:40 +0000 Subject: - Fixes Savannah bug #18435 --- ChangeLog | 4 ++++ ar.c | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e53a55..92637f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-06-13 Paul Smith + * ar.c (ar_name): Ensure that targets with empty parens aren't + considered archive member references: archive members must have a + non-empty "member" string. Fixes Savannah bug #18435. + * function.c (string_glob): Rely on multi_glob() to determine whether files exist or not. Remove call to file_exists_p() which is not always correct. Fixes Savannah bug #21231. diff --git a/ar.c b/ar.c index bb9c9ed..304ee9c 100644 --- a/ar.c +++ b/ar.c @@ -24,8 +24,9 @@ this program. If not, see . */ #include "dep.h" #include -/* Return nonzero if NAME is an archive-member reference, zero if not. - An archive-member reference is a name like `lib(member)'. +/* Return nonzero if NAME is an archive-member reference, zero if not. An + archive-member reference is a name like `lib(member)' where member is a + non-empty string. If a name like `lib((entry))' is used, a fatal error is signaled at the attempt to use this unsupported feature. */ @@ -39,7 +40,7 @@ ar_name (const char *name) return 0; end = p + strlen (p) - 1; - if (*end != ')') + if (*end != ')' || end == p + 1) return 0; if (p[1] == '(' && end[-1] == ')') -- cgit v1.2.3