fileio.c (ext2fs_file_lseek): Fix bug added when adding 64-bit

	support; avoid null dereference when ret_pos is NULL.

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 45fc6bc..36631cc 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-10  Theodore Ts'o  <tytso@mit.edu>
+
+       * fileio.c (ext2fs_file_lseek): Fix bug added when adding 64-bit
+               support; avoid null dereference when ret_pos is NULL.
+
 2003-03-06  Theodore Tso  <tytso@mit.edu>
 
        * ext2_types.h.in: Don't redefine types if other e2fsprogs

diff --git a/lib/ext2fs/fileio.c b/lib/ext2fs/fileio.c
index 859135b..3db4102 100644 (file)
--- a/lib/ext2fs/fileio.c
+++ b/lib/ext2fs/fileio.c
@@ -310,7 +310,8 @@ errcode_t ext2fs_file_lseek(ext2_file_t file, ext2_off_t offset,
        
        loffset = offset;
        retval = ext2fs_file_llseek(file, loffset, whence, &ret_loffset);
-       *ret_pos = (ext2_off_t) ret_loffset;
+       if (ret_pos)
+               *ret_pos = (ext2_off_t) ret_loffset;
        return retval;
 }