Bump xfsprogs version number, merge trivial double-free bugfix from community.

Merge of master-melb:xfs-cmds:26306a by kenmcd.

diff --git a/VERSION b/VERSION
index 77357c4c87d72cf06ecf2dc7a872d461f36db7f6..4c61d9944aa1398d1e7de138ad577b7a832cb2f8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=8
-PKG_REVISION=2
+PKG_REVISION=3
 PKG_BUILD=1

diff --git a/debian/changelog b/debian/changelog
index a6202572f78898f0ad7712cff7cc743e4771a1d4..fa54de6bfa4eed371ca885a9851fc5378885615b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-xfsprogs (2.8.2-1) unstable; urgency=low
+xfsprogs (2.8.3-1) unstable; urgency=low
 
   * New upstream release.
+  * Fix segv in xfs_growfs command (closes: #374686)
+  * Ensure source tarball in correct location (closes: #374696)
 
- -- Nathan Scott <nathans@debian.org>  Sat, 17 Jun 2006 14:14:15 +1000
+ -- Nathan Scott <nathans@debian.org>  Wed, 21 Jun 2006 15:19:56 +1000
 
 xfsprogs (2.7.16-1) unstable; urgency=low
 
@@ -20,7 +22,7 @@ xfsprogs (2.7.14-1) unstable; urgency=low
 xfsprogs (2.7.12-1) unstable; urgency=low
 
   * New upstream release.
-  * Includes polish transalation from Jakub Bogusz.
+  * Includes polish translation from Jakub Bogusz.
 
  -- Nathan Scott <nathans@debian.org>  Tue, 31 Jan 2006 13:35:39 +1100
 
@@ -343,8 +345,8 @@ xfsprogs (1.3.15-1) unstable; urgency=low
 
 xfsprogs (1.3.14-1) unstable; urgency=low
 
- * Fix minor package version numbering issue (closes: #117545)
- * Fix bug in mkfs.xfs device size cross-check for realtime device
+  * Fix minor package version numbering issue (closes: #117545)
+  * Fix bug in mkfs.xfs device size cross-check for realtime device
 
  -- Nathan Scott <nathans@debian.org>  Wed,  5 Dec 2001 17:13:06 +1100
 

diff --git a/doc/CHANGES b/doc/CHANGES
index 5ed493a669e052c660cb9bc15e2ed0073b382adc..49a37f8305615285d34a098516b63f3f28f4f766 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,6 @@
+xfsprogs-2.8.3 (21 June 2006)
+       - Fix a possible segv in xfs_growfs.
+
 xfsprogs-2.8.2 (17 June 2006)
        - More updates to repair/libxfs for improving performance
        - Incorporate librt into the build process for lio_listio

diff --git a/libxcmd/paths.c b/libxcmd/paths.c
index b9c5e97fb41eefd48f47606fe1780de30b492234..70383e05198b22d24a4c56d16b36e58de8951938 100644 (file)
--- a/libxcmd/paths.c
+++ b/libxcmd/paths.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005 Silicon Graphics, Inc.
+ * Copyright (c) 2005-2006 Silicon Graphics, Inc.
  * All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -105,15 +105,15 @@ fs_table_insert(
 
        datadev = logdev = rtdev = 0;
        if (!fs_device_number(dir, &datadev, 0))
-               goto error;
+               return errno;
        if (fslog && (fslog = fs_device_number(fslog, &logdev, 1)) == NULL)
-               goto error;
+               return errno;
        if (fsrt && (fsrt = fs_device_number(fsrt, &rtdev, 1)) == NULL)
-               goto error;
+               return errno;
 
        fs_table = realloc(fs_table, sizeof(fs_path_t) * (fs_count + 1));
        if (!fs_table)
-               goto error;
+               return errno;
 
        fs_path = &fs_table[fs_count];
        fs_path->fs_dir = dir;
@@ -127,13 +127,6 @@ fs_table_insert(
        fs_path->fs_rtdev = rtdev;
        fs_count++;
        return 0;
-
-  error:
-       if (dir) free(dir);
-       if (fsrt) free(fsrt);
-       if (fslog) free(fslog);
-       if (fsname) free(fsname);
-       return errno;
 }
 
 void
@@ -191,8 +184,11 @@ fs_table_initialise_mounts(
 {
        struct mntent   *mnt;
        FILE            *mtp;
-       char            *dir = NULL, *fsname = NULL, *fslog, *fsrt;
-       int             error = 0, found = 0;
+       char            *dir, *fsname, *fslog, *fsrt;
+       int             error, found;
+
+       error = found = 0;
+       dir = fsname = fslog = fsrt = NULL;
 
        if (!mtab_file) {
                mtab_file = PROC_MOUNTS;
@@ -226,8 +222,10 @@ fs_table_initialise_mounts(
        if (!error && path && !found)
                error = ENXIO;
        if (error) {
-               free(dir);
-               free(fsname);
+               if (dir) free(dir);
+               if (fsrt) free(fsrt);
+               if (fslog) free(fslog);
+               if (fsname) free(fsname);
        }
        return error;
 }
@@ -240,8 +238,11 @@ fs_table_initialise_mounts(
        char            *path)
 {
        struct statfs   *stats;
-       char            *dir = NULL, *fsname = NULL, *fslog = NULL, *fsrt = NULL;
-       int             i, count, found = 0, error = 0;
+       char            *dir, *fsname, *fslog, *fsrt;
+       int             i, count, error, found;
+
+       error = found = 0;
+       dir = fsname = fslog = fsrt = NULL;
 
        if ((count = getmntinfo(&stats, 0)) < 0) {
                perror("getmntinfo");
@@ -270,8 +271,10 @@ fs_table_initialise_mounts(
        if (!error && path && !found)
                error = ENXIO;
        if (error) {
-               free(dir);
-               free(fsname);
+               if (dir) free(dir);
+               if (fsrt) free(fsrt);
+               if (fslog) free(fslog);
+               if (fsname) free(fsname);
        }
        return error;
 }
@@ -339,8 +342,8 @@ fs_table_initialise_projects(
        if (!error && project && !found)
                error = ENOENT;
        if (error) {
-               free(dir);
-               free(fsname);
+               if (dir) free(dir);
+               if (fsname) free(fsname);
        }
        return error;
 }