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 2013/07/09 06:00:12 UTC
svn commit: r1501063 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_ra_serf/xml.c
Author: svn-role
Date: Tue Jul 9 04:00:12 2013
New Revision: 1501063
URL: http://svn.apache.org/r1501063
Log:
Merge r1498851 from trunk:
* r1498851
Provide an explicit error in the serf xml parser when the root element
isn't matched in the transition table.
Notes:
This turns a class of previously invisible errors in an easy to diagnose
error message.
Votes:
+1: rhuijben, gstein, ivan
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_ra_serf/xml.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1498851
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1501063&r1=1501062&r2=1501063&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul 9 04:00:12 2013
@@ -120,15 +120,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1498851
- Provide an explicit error in the serf xml parser when the root element
- isn't matched in the transition table.
- Notes:
- This turns a class of previously invisible errors in an easy to diagnose
- error message.
- Votes:
- +1: rhuijben, gstein, ivan
-
* r1497310
Backport 'svn help cleanup' improvements made in r1497310.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_ra_serf/xml.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_ra_serf/xml.c?rev=1501063&r1=1501062&r2=1501063&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_ra_serf/xml.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_ra_serf/xml.c Tue Jul 9 04:00:12 2013
@@ -615,6 +615,14 @@ svn_ra_serf__xml_cb_start(svn_ra_serf__x
}
if (scan->ns == NULL)
{
+ if (current->state == 0)
+ {
+ return svn_error_createf(
+ SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
+ _("XML Parsing failed: Unexpected root element '%s'"),
+ elemname.name);
+ }
+
xmlctx->waiting = elemname;
/* ### return? */
return SVN_NO_ERROR;