From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Tue, 5 Jul 2005 17:45:37 +0000 (+0000)
Subject: * amq/pawd.c (getawd): avoid buffer overflow.  Bug fix from Graeme
X-Git-Tag: am-utils-6_1_1~29
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=2049513ec152b4cbb80caee62979046fb5659f00;p=am-utils-6.2.git

* amq/pawd.c (getawd): avoid buffer overflow.  Bug fix from Graeme
Wilford <G.Wilford@surrey.ac.uk>.
---

diff --git a/AUTHORS b/AUTHORS
index f0f6f690..734720c5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -419,3 +419,7 @@ March 14, 2005: small patch to amd2ldif.
 * Adam Morley <adam at gmi dot com>
 January 27, 2005: synchronize what amd2ldif does vs. what the ldap.schema
 expects.
+
+* Graeme Wilford <G.Wilford@surrey.ac.uk>
+July 4, 2005: buffer overflow in pawd.
+
diff --git a/ChangeLog b/ChangeLog
index 6b8d4ad9..c802c065 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-05  Erez Zadok  <ezk@cs.sunysb.edu>
+
+	* amq/pawd.c (getawd): avoid buffer overflow.  Bug fix from Graeme
+	Wilford <G.Wilford@surrey.ac.uk>.
+
 2005-06-30  Erez Zadok  <ezk@cs.sunysb.edu>
 
 	* amd/map.c (get_next_exported_ap): Avoid running off the end of
diff --git a/NEWS b/NEWS
index 9b0a3e59..9c3e9c14 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@
 	* extern for sleep(3) may be missing on older gcc systems
 	* updated nfs_args structure on aix4.
 	* possible running off end of exported_ap[] array.
+	* buffer overflow in pawd.
 
 *** Notes specific to am-utils version 6.1
 
diff --git a/amq/pawd.c b/amq/pawd.c
index 9d0339b2..3014c370 100644
--- a/amq/pawd.c
+++ b/amq/pawd.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: pawd.c,v 1.17 2005/04/25 01:54:50 christos Exp $
+ * $Id: pawd.c,v 1.18 2005/07/05 17:45:37 ezk Exp $
  *
  */
 
@@ -251,7 +251,7 @@ static char *
 getawd(char *path)
 {
 #ifdef HAVE_GETCWD
-  char *wd = getcwd(path, MAXPATHLEN+1);
+  char *wd = getcwd(path, MAXPATHLEN);
 #else /* not HAVE_GETCWD */
   char *wd = getwd(path);
 #endif /* not HAVE_GETCWD */