X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsavedir.c;h=e969407d32ee2b9a06fff5ba60bf6b4d41e2a934;hb=c81ef04f8c788c32c9cd97957e1a0cfdd947a0ec;hp=31aeb9af0c6cd3778d533ee7b295367673b16a9f;hpb=8e2cc070abdfaaae0cbb390ddb0fbdf90b62f2bc;p=gnulib.git

diff --git a/lib/savedir.c b/lib/savedir.c
index 31aeb9af0..e969407d3 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -1,5 +1,5 @@
 /* savedir.c -- save the list of files in a directory in a string
-   Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -87,6 +87,11 @@ savedir (const char *dir, off_t name_size)
   if (dirp == NULL)
     return NULL;
 
+  /* Be sure name_size is at least `1' so there's room for
+     the final NUL byte.  */
+  if (name_size <= 0)
+    name_size = 1;
+
   name_space = (char *) malloc (name_size);
   if (name_space == NULL)
     {
@@ -102,7 +107,7 @@ savedir (const char *dir, off_t name_size)
 	  || (dp->d_name[1] != '\0'
 	      && (dp->d_name[1] != '.' || dp->d_name[2] != '\0')))
 	{
-	  size_t off_t = (namep - name_space) + NAMLEN (dp) + 2;
+	  off_t size_needed = (namep - name_space) + NAMLEN (dp) + 2;
 
 	  if (size_needed > name_size)
 	    {