subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r881936 - in /subversion/branches/1.6.x: ./ CHANGES STATUS subversion/libsvn_fs_fs/fs_fs.c
Date Wed, 18 Nov 2009 21:09:19 GMT
Author: hwright
Date: Wed Nov 18 21:09:18 2009
New Revision: 881936

URL: http://svn.apache.org/viewvc?rev=881936&view=rev
Log:
Merge r881905 from trunk:

  * r881905
    Fix a segmentation fault in libsvn_fs_fs/fs_fs.c.
    Justification:
      Passing NULL (or rather, 0) for a pool is a bad idea.
    Votes:
      +1: steveking, stsp, hwright

Modified:
    subversion/branches/1.6.x/   (props changed)
    subversion/branches/1.6.x/CHANGES   (props changed)
    subversion/branches/1.6.x/STATUS
    subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c

Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 18 21:09:18 2009
@@ -1,3 +1,4 @@
+/subversion/trunk:881905
 subversion/branches/1.5.x-r30215:870312
 subversion/branches/1.6.x-UNC-paths:876471-876545
 subversion/branches/1.6.x-dirent-basename:876130-876262

Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 18 21:09:18 2009
@@ -1,3 +1,4 @@
+/subversion/trunk/CHANGES:881905
 subversion/branches/1.5.x-r30215/CHANGES:870312
 subversion/branches/1.6.x-UNC-paths/CHANGES:876471-876545
 subversion/branches/1.6.x-dirent-basename/CHANGES:876130-876262

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=881936&r1=881935&r2=881936&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Wed Nov 18 21:09:18 2009
@@ -232,10 +232,3 @@
 
 Approved changes:
 =================
-
-  * r881905
-    Fix a segmentation fault in libsvn_fs_fs/fs_fs.c.
-    Justification:
-      Passing NULL (or rather, 0) for a pool is a bad idea.
-    Votes:
-      +1: steveking, stsp, hwright

Modified: subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c?rev=881936&r1=881935&r2=881936&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c Wed Nov 18 21:09:18 2009
@@ -790,7 +790,7 @@
   if (!err)
     {
       apr_off_t offset = 0;
-      err = svn_io_file_seek(*file, APR_END, &offset, 0);
+      err = svn_io_file_seek(*file, APR_END, &offset, pool);
     }
 
   if (err)



Mime
View raw message