Author: svn-role
Date: Wed Apr 15 04:01:46 2015
New Revision: 1673643
URL: http://svn.apache.org/r1673643
Log:
Merge r1673062 from trunk:
* r1673062
Fix 2 error leaks in the X.509 code.
Justification:
Error leaks are bad and no reason to leave them unfixed.
Votes:
+1: breser, philip, stefan2
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/libsvn_subr/x509parse.c
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 15 04:01:46 2015
@@ -90,4 +90,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667233,1667235,1667301,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669746,1669749,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673228,1673282,1673445
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667233,1667235,1667301,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669746,1669749,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673062,1673228,1673282,1673445
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1673643&r1=1673642&r2=1673643&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Apr 15 04:01:46 2015
@@ -234,10 +234,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1673062
- Fix 2 error leaks in the X.509 code.
- Justification:
- Error leaks are bad and no reason to leave them unfixed.
- Votes:
- +1: breser, philip, stefan2
Modified: subversion/branches/1.9.x/subversion/libsvn_subr/x509parse.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_subr/x509parse.c?rev=1673643&r1=1673642&r2=1673643&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_subr/x509parse.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_subr/x509parse.c Wed Apr 15
04:01:46 2015
@@ -685,6 +685,8 @@ x509_get_ext(apr_array_header_t *dnsname
*p += len;
continue;
}
+
+ return svn_error_trace(err);
}
else
{
@@ -1052,7 +1054,7 @@ svn_x509_parse_cert(svn_x509_certinfo_t
*/
err = asn1_get_tag(&p, end, &len, ASN1_CONSTRUCTED | ASN1_SEQUENCE);
if (err)
- return svn_error_create(SVN_ERR_X509_CERT_INVALID_FORMAT, NULL, NULL);
+ return svn_error_create(SVN_ERR_X509_CERT_INVALID_FORMAT, err, NULL);
if (len != (end - p))
{
