← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/bindings/javahl/native/ProplistCallback.cpp

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/bindings/javahl/native/ProplistCallback.cpp
89
89
  static volatile jmethodID mid = 0;
90
90
  if (mid == 0)
91
91
    {
92
 
      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ProplistCallback");
 
92
      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/ProplistCallback"));
93
93
      if (JNIUtil::isJavaExceptionThrown())
94
94
        return SVN_NO_ERROR;
95
95
 
104
104
  if (JNIUtil::isJavaExceptionThrown())
105
105
    POP_AND_RETURN(SVN_NO_ERROR);
106
106
 
107
 
  jobject jmap = CreateJ::PropertyMap(prop_hash);
 
107
  jobject jmap = CreateJ::PropertyMap(prop_hash, pool);
108
108
  if (JNIUtil::isJavaExceptionThrown())
109
109
    POP_AND_RETURN(SVN_NO_ERROR);
110
110
 
112
112
  env->CallVoidMethod(m_callback, mid, jpath, jmap);
113
113
  // We return whether an exception was thrown or not.
114
114
 
115
 
  env->PopLocalFrame(NULL);
116
 
 
117
 
  return SVN_NO_ERROR;
 
115
  POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
118
116
}
119
117
 
120
118
 
144
142
  static jmethodID mid = 0;
145
143
  if (mid == 0)
146
144
    {
147
 
      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/InheritedProplistCallback");
 
145
      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/InheritedProplistCallback"));
148
146
      if (JNIUtil::isJavaExceptionThrown())
149
147
        return SVN_NO_ERROR;
150
148
 
159
157
  if (JNIUtil::isJavaExceptionThrown())
160
158
    POP_AND_RETURN(SVN_NO_ERROR);
161
159
 
162
 
  jobject jmap = CreateJ::PropertyMap(prop_hash);
 
160
  jobject jmap = CreateJ::PropertyMap(prop_hash, pool);
163
161
  if (JNIUtil::isJavaExceptionThrown())
164
162
    POP_AND_RETURN(SVN_NO_ERROR);
165
163