You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ha...@apache.org on 2021/04/23 04:59:29 UTC
svn commit: r1889114 -
/subversion/trunk/subversion/tests/libsvn_subr/task-test.c
Author: hartmannathan
Date: Fri Apr 23 04:59:29 2021
New Revision: 1889114
URL: http://svn.apache.org/viewvc?rev=1889114&view=rev
Log:
Follow-up to r1888589: Fix bad size in memory allocations
* subversion/tests/libsvn_subr/task-test.c
(counter_func): Fix wrong allocation size in 5 similar calls to
apr_palloc(). Was allocating size of pointer, not size of pointed-to
object.
Found by: danielsh
Modified:
subversion/trunk/subversion/tests/libsvn_subr/task-test.c
Modified: subversion/trunk/subversion/tests/libsvn_subr/task-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/task-test.c?rev=1889114&r1=1889113&r2=1889114&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/task-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/task-test.c Fri Apr 23 04:59:29 2021
@@ -124,32 +124,32 @@ counter_func(void **result,
if (value > 1)
{
- partial_result = apr_palloc(result_pool, sizeof(partial_result));
+ partial_result = apr_palloc(result_pool, sizeof(*partial_result));
*partial_result = 1;
value -= *partial_result;
sub_task_pool = svn_task__create_process_pool(task);
- partial_baton = apr_palloc(sub_task_pool, sizeof(partial_baton));
+ partial_baton = apr_palloc(sub_task_pool, sizeof(*partial_baton));
*partial_baton = MAX(1, value / 2);
value -= *partial_baton;
- SVN_ERR(svn_task__add_similar(task, sub_task_pool,
+ SVN_ERR(svn_task__add_similar(task, sub_task_pool,
partial_result, partial_baton));
}
if (cancel_func)
SVN_ERR(cancel_func(cancel_baton));
-
+
if (value > 1)
{
- partial_result = apr_palloc(result_pool, sizeof(partial_result));
+ partial_result = apr_palloc(result_pool, sizeof(*partial_result));
*partial_result = 1;
value -= *partial_result;
sub_task_pool = svn_task__create_process_pool(task);
- partial_baton = apr_palloc(sub_task_pool, sizeof(partial_baton));
+ partial_baton = apr_palloc(sub_task_pool, sizeof(*partial_baton));
*partial_baton = value - 1;
value -= *partial_baton;
@@ -157,7 +157,7 @@ counter_func(void **result,
partial_result, partial_baton));
}
- partial_result = apr_palloc(result_pool, sizeof(partial_result));
+ partial_result = apr_palloc(result_pool, sizeof(*partial_result));
*partial_result = value;
*result = partial_result;
@@ -175,7 +175,7 @@ sum_func(svn_task__t *task,
{
apr_int64_t *result_p = result;
apr_int64_t *output_p = output_baton;
-
+
if (result_p)
*output_p += *result_p;
@@ -228,7 +228,7 @@ test_cancellation(apr_pool_t *pool)
pool, pool),
SVN_ERR_CANCELLED);
SVN_TEST_ASSERT(result == 10000);
-
+
return SVN_NO_ERROR;
}
Re: svn commit: r1889114 - /subversion/trunk/subversion/tests/libsvn_subr/task-test.c
Posted by Nathan Hartman <ha...@gmail.com>.
On Fri, Apr 23, 2021 at 12:59 AM <ha...@apache.org> wrote:
> Modified: subversion/trunk/subversion/tests/libsvn_subr/task-test.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/task-test.c?rev=1889114&r1=1889113&r2=1889114&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/libsvn_subr/task-test.c (original)
> +++ subversion/trunk/subversion/tests/libsvn_subr/task-test.c Fri Apr 23 04:59:29 2021
> @@ -124,32 +124,32 @@ counter_func(void **result,
>
> if (value > 1)
> {
> - partial_result = apr_palloc(result_pool, sizeof(partial_result));
> + partial_result = apr_palloc(result_pool, sizeof(*partial_result));
> *partial_result = 1;
> value -= *partial_result;
>
> sub_task_pool = svn_task__create_process_pool(task);
>
> - partial_baton = apr_palloc(sub_task_pool, sizeof(partial_baton));
> + partial_baton = apr_palloc(sub_task_pool, sizeof(*partial_baton));
> *partial_baton = MAX(1, value / 2);
> value -= *partial_baton;
>
> - SVN_ERR(svn_task__add_similar(task, sub_task_pool,
> + SVN_ERR(svn_task__add_similar(task, sub_task_pool,
> partial_result, partial_baton));
> }
>
> if (cancel_func)
> SVN_ERR(cancel_func(cancel_baton));
> -
> +
My editor removed some trailing whitespaces, such as the example
above, and I forgot to un-remove them before committing. :-/
Nathan
Re: svn commit: r1889114 - /subversion/trunk/subversion/tests/libsvn_subr/task-test.c
Posted by Nathan Hartman <ha...@gmail.com>.
On Fri, Apr 23, 2021 at 12:59 AM <ha...@apache.org> wrote:
> Modified: subversion/trunk/subversion/tests/libsvn_subr/task-test.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/task-test.c?rev=1889114&r1=1889113&r2=1889114&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/libsvn_subr/task-test.c (original)
> +++ subversion/trunk/subversion/tests/libsvn_subr/task-test.c Fri Apr 23 04:59:29 2021
> @@ -124,32 +124,32 @@ counter_func(void **result,
>
> if (value > 1)
> {
> - partial_result = apr_palloc(result_pool, sizeof(partial_result));
> + partial_result = apr_palloc(result_pool, sizeof(*partial_result));
> *partial_result = 1;
> value -= *partial_result;
>
> sub_task_pool = svn_task__create_process_pool(task);
>
> - partial_baton = apr_palloc(sub_task_pool, sizeof(partial_baton));
> + partial_baton = apr_palloc(sub_task_pool, sizeof(*partial_baton));
> *partial_baton = MAX(1, value / 2);
> value -= *partial_baton;
>
> - SVN_ERR(svn_task__add_similar(task, sub_task_pool,
> + SVN_ERR(svn_task__add_similar(task, sub_task_pool,
> partial_result, partial_baton));
> }
>
> if (cancel_func)
> SVN_ERR(cancel_func(cancel_baton));
> -
> +
My editor removed some trailing whitespaces, such as the example
above, and I forgot to un-remove them before committing. :-/
Nathan