You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/03/14 12:18:56 UTC

svn commit: r1456394 - in /subversion/trunk/subversion/bindings/javahl/native: DiffOptions.cpp DiffOptions.h

Author: philip
Date: Thu Mar 14 11:18:56 2013
New Revision: 1456394

URL: http://svn.apache.org/r1456394
Log:
Pass SVN:Pool by reference otherwise a subpool gets created/destroyed
and the allocated memory becomes invalid.

* subversion/bindings/javahl/native/DiffOptions.h
* subversion/bindings/javahl/native/DiffOptions.cpp
  (DiffOptions::optionsArray): Pass pool by referance.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/DiffOptions.cpp
    subversion/trunk/subversion/bindings/javahl/native/DiffOptions.h

Modified: subversion/trunk/subversion/bindings/javahl/native/DiffOptions.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/DiffOptions.cpp?rev=1456394&r1=1456393&r2=1456394&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/DiffOptions.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/DiffOptions.cpp Thu Mar 14 11:18:56 2013
@@ -54,7 +54,7 @@ DiffOptions::DiffOptions(jobject joption
 {}
 
 
-apr_array_header_t *DiffOptions::optionsArray(SVN::Pool resultPool) const
+apr_array_header_t *DiffOptions::optionsArray(SVN::Pool &resultPool) const
 {
   // JavaHL ignores the default diff options from the client config
   // files, so we always have to allocate an array, even if it will

Modified: subversion/trunk/subversion/bindings/javahl/native/DiffOptions.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/DiffOptions.h?rev=1456394&r1=1456393&r2=1456394&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/DiffOptions.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/DiffOptions.h Thu Mar 14 11:18:56 2013
@@ -37,7 +37,7 @@ class DiffOptions
  public:
   DiffOptions(jobject joptions);
 
-  apr_array_header_t *optionsArray(SVN::Pool resultPool) const;
+  apr_array_header_t *optionsArray(SVN::Pool &resultPool) const;
 
   svn_boolean_t useGitDiffFormat() const
   {



Re: svn commit: r1456394 - in /subversion/trunk/subversion/bindings/javahl/native: DiffOptions.cpp DiffOptions.h

Posted by Branko Čibej <br...@wandisco.com>.
On 14.03.2013 12:18, philip@apache.org wrote:
> Author: philip
> Date: Thu Mar 14 11:18:56 2013
> New Revision: 1456394
>
> URL: http://svn.apache.org/r1456394
> Log:
> Pass SVN:Pool by reference otherwise a subpool gets created/destroyed
> and the allocated memory becomes invalid.

Yikes. Thanks for spotting that. Stuff doesn't crash on the Mac, or I'd
have noticed ...

-- Brane


-- 
Branko Čibej
Director of Subversion | WANdisco | www.wandisco.com