You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/04/24 06:01:10 UTC
svn commit: r1589570 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_delta/svndiff.c
Author: svn-role
Date: Thu Apr 24 04:01:09 2014
New Revision: 1589570
URL: http://svn.apache.org/r1589570
Log:
Merge r1587968 from trunk:
* r1587968
Maintain data[len]=0 invariant for svn_string_t.
Justification:
Code may rely on null byte being present.
Notes:
Triggers a read beyond allocated memory on trunk but no known
misbehaviour on 1.8.
Votes:
+1: philip, rhuijben, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_delta/svndiff.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1587968
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1589570&r1=1589569&r2=1589570&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Apr 24 04:01:09 2014
@@ -303,15 +303,6 @@ Approved changes:
Votes:
+1: philip, rhuijben, stefan2
- * 1585499
- Build with apr-0.9.x.
- Justification:
- 1.8 claims 0.9 support but it doesn't work.
- Branch:
- ^/subversion/branches/1.8.x-apr-0.9
- Votes:
- +1: philip, rhuijben, stefan2
-
* r1581810, 1584342
Fix issue 4412, locks lost from working copy with pre-1.6.17 servers.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_delta/svndiff.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_delta/svndiff.c?rev=1589570&r1=1589569&r2=1589570&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_delta/svndiff.c Thu Apr 24 04:01:09 2014
@@ -723,8 +723,6 @@ decode_window(svn_txdelta_window_t *wind
svn_stringbuf_t *instout = svn_stringbuf_create_empty(pool);
svn_stringbuf_t *ndout = svn_stringbuf_create_empty(pool);
- /* these may in fact simply return references to insend */
-
SVN_ERR(zlib_decode(insend, newlen, ndout,
SVN_DELTA_WINDOW_SIZE));
SVN_ERR(zlib_decode(data, insend - data, instout,
@@ -739,7 +737,13 @@ decode_window(svn_txdelta_window_t *wind
}
else
{
- new_data->data = (const char *) insend;
+ /* Copy the data because an svn_string_t must have the invariant
+ data[len]=='\0'. */
+ char *buf = apr_palloc(pool, newlen + 1);
+
+ memcpy(buf, insend, newlen);
+ buf[newlen] = '\0';
+ new_data->data = buf;
new_data->len = newlen;
}
Re: backport.pl still misbehaving
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Philip Martin wrote on Thu, Apr 24, 2014 at 11:29:34 +0100:
> svn-role@apache.org writes:
>
> > Author: svn-role
> > Date: Thu Apr 24 04:01:09 2014
> > New Revision: 1589570
> >
> > URL: http://svn.apache.org/r1589570
> > Log:
> > Merge r1587968 from trunk:
> >
> > * r1587968
> > Maintain data[len]=0 invariant for svn_string_t.
> > Justification:
> > Code may rely on null byte being present.
> > Notes:
> > Triggers a read beyond allocated memory on trunk but no known
> > misbehaviour on 1.8.
> > Votes:
> > +1: philip, rhuijben, stefan2
> >
> > Modified:
> > subversion/branches/1.8.x/ (props changed)
> > subversion/branches/1.8.x/STATUS
> > subversion/branches/1.8.x/subversion/libsvn_delta/svndiff.c
> >
> > Propchange: subversion/branches/1.8.x/
> > ------------------------------------------------------------------------------
> > Merged /subversion/trunk:r1587968
> >
> > Modified: subversion/branches/1.8.x/STATUS
> > URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1589570&r1=1589569&r2=1589570&view=diff
> > ==============================================================================
> > --- subversion/branches/1.8.x/STATUS (original)
> > +++ subversion/branches/1.8.x/STATUS Thu Apr 24 04:01:09 2014
> > @@ -303,15 +303,6 @@ Approved changes:
> > Votes:
> > +1: philip, rhuijben, stefan2
> >
> > - * 1585499
> > - Build with apr-0.9.x.
> > - Justification:
> > - 1.8 claims 0.9 support but it doesn't work.
> > - Branch:
> > - ^/subversion/branches/1.8.x-apr-0.9
> > - Votes:
> > - +1: philip, rhuijben, stefan2
> > -
> > * r1581810, 1584342
> > Fix issue 4412, locks lost from working copy with pre-1.6.17 servers.
> > Justification:
> >
>
> The log message matches the code change but the STATUS change is wrong.
For the records, these commits were done by:
% ssh svn-qavm.apache.org 'tail -2 ~svnsvn/live-version.log'
20140424:
1569237
and that revision was supposed to be predating the "wrong STATUS entry
deleted" bug.
I've gone ahead and disabled svn-role by commenting out the crontab
entry, to avoid any further breakage. How merges are to be done in the
meantime is up to the RM.
I'll also note that the cron job generated an error tonight (the output
was mailed to whoever is on the svnsvn@svn-qavm alias in /etc/aliases).
backport.pl still misbehaving
Posted by Philip Martin <ph...@wandisco.com>.
svn-role@apache.org writes:
> Author: svn-role
> Date: Thu Apr 24 04:01:09 2014
> New Revision: 1589570
>
> URL: http://svn.apache.org/r1589570
> Log:
> Merge r1587968 from trunk:
>
> * r1587968
> Maintain data[len]=0 invariant for svn_string_t.
> Justification:
> Code may rely on null byte being present.
> Notes:
> Triggers a read beyond allocated memory on trunk but no known
> misbehaviour on 1.8.
> Votes:
> +1: philip, rhuijben, stefan2
>
> Modified:
> subversion/branches/1.8.x/ (props changed)
> subversion/branches/1.8.x/STATUS
> subversion/branches/1.8.x/subversion/libsvn_delta/svndiff.c
>
> Propchange: subversion/branches/1.8.x/
> ------------------------------------------------------------------------------
> Merged /subversion/trunk:r1587968
>
> Modified: subversion/branches/1.8.x/STATUS
> URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1589570&r1=1589569&r2=1589570&view=diff
> ==============================================================================
> --- subversion/branches/1.8.x/STATUS (original)
> +++ subversion/branches/1.8.x/STATUS Thu Apr 24 04:01:09 2014
> @@ -303,15 +303,6 @@ Approved changes:
> Votes:
> +1: philip, rhuijben, stefan2
>
> - * 1585499
> - Build with apr-0.9.x.
> - Justification:
> - 1.8 claims 0.9 support but it doesn't work.
> - Branch:
> - ^/subversion/branches/1.8.x-apr-0.9
> - Votes:
> - +1: philip, rhuijben, stefan2
> -
> * r1581810, 1584342
> Fix issue 4412, locks lost from working copy with pre-1.6.17 servers.
> Justification:
>
The log message matches the code change but the STATUS change is wrong.
--
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*