argp: avoid memory leak

argp has been leaking memory since commit 79c0a43, in Jul 2006.

* modules/argp (Depends-on): Use dirname-lgpl, not dirname.
* lib/argp-namefrob.h (__argp_base_name): Use last_component, not
base_name, since the latter malloc()s and can call exit().

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 73d4a061e7a37fdad84563e2abf5d7d429c2a140..47c75be4c6e2140ef195874fded70a85f353e2a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-10-29  Eric Blake  <ebb9@byu.net>
 
+       argp: avoid memory leak
+       * modules/argp (Depends-on): Use dirname-lgpl, not dirname.
+       * lib/argp-namefrob.h (__argp_base_name): Use last_component, not
+       base_name, since the latter malloc()s and can call exit().
+       Leak introduced 2006-07-03.
+
        dirname-lgpl: adjust clients that don't need full dirname
        * modules/backupfile (Depends-on): Use dirname-lgpl, not dirname.
        * modules/filenamecat (Depends-on): Likewise.

diff --git a/lib/argp-namefrob.h b/lib/argp-namefrob.h
index fcb082ad2e11bc774df07c8c2de675deab135343..7b7b173d3853527f0d3abe46a480467388e09685 100644 (file)
--- a/lib/argp-namefrob.h
+++ b/lib/argp-namefrob.h
@@ -1,5 +1,5 @@
 /* Name frobnication for compiling argp outside of glibc
-   Copyright (C) 1997, 2003, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2003, 2007, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -147,7 +147,7 @@
 extern char *__argp_base_name(const char *arg);
 #else
 # include "dirname.h"
-# define __argp_base_name base_name
+# define __argp_base_name last_component
 #endif
 
 #if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME

diff --git a/modules/argp b/modules/argp
index e772b3e6bc922ec1d06b74d8b86147725bf95c15..bb10844324950803afeb98ed887fe83d3f4ee133 100644 (file)
--- a/modules/argp
+++ b/modules/argp
@@ -24,7 +24,7 @@ m4/argp.m4
 
 Depends-on:
 alloca
-dirname
+dirname-lgpl
 getopt-gnu
 strchrnul
 sysexits