You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2013/05/17 21:21:25 UTC
svn commit: r1483955 - /subversion/trunk/subversion/svnadmin/svnadmin.c
Author: danielsh
Date: Fri May 17 19:21:25 2013
New Revision: 1483955
URL: http://svn.apache.org/r1483955
Log:
'svnadmin info': Fix a future segfault.
* subversion/svnadmin/svnadmin.c
(subcommand_info): Explicitly convert the array element to svn_sort__item_t.
Using APR_ARRAY_IDX(_, _, const char *) would segfault once the array has
two elements (because it would mis-compute the array stride).
Modified:
subversion/trunk/subversion/svnadmin/svnadmin.c
Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1483955&r1=1483954&r2=1483955&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Fri May 17 19:21:25 2013
@@ -1684,8 +1684,13 @@ subcommand_info(apr_getopt_t *os, void *
pool);
for (i = 0; i < capabilities->nelts; i++)
- SVN_ERR(svn_cmdline_printf(pool, _("Repository Capability: %s\n"),
- APR_ARRAY_IDX(capabilities, i, const char *)));
+ {
+ svn_sort__item_t *item = &APR_ARRAY_IDX(capabilities, i,
+ svn_sort__item_t);
+ const char *capability = item->key;
+ SVN_ERR(svn_cmdline_printf(pool, _("Repository Capability: %s\n"),
+ capability));
+ }
}
{