Rev 1872: Add extra check, avoid duplicating URL. in file:///data/jelmer/bzr-svn/trunk/
Jelmer Vernooij
jelmer at samba.org
Mon Sep 8 23:20:38 BST 2008
At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1872
revision-id: jelmer at samba.org-20080908222036-00frv6b2nqdwl6jc
parent: jelmer at samba.org-20080908221622-hq3bor98mm01xoup
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-09-09 00:20:36 +0200
message:
Add extra check, avoid duplicating URL.
modified:
ra.c ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
=== modified file 'ra.c'
--- a/ra.c 2008-09-05 22:31:29 +0000
+++ b/ra.c 2008-09-08 22:20:36 +0000
@@ -737,10 +737,17 @@
ret->root = NULL;
ret->pool = Pool(NULL);
- if (ret->pool == NULL)
+ if (ret->pool == NULL) {
+ PyObject_Del(ret);
return NULL;
+ }
ret->url = svn_path_canonicalize(url, ret->pool);
+ if (ret->url == NULL) {
+ apr_pool_destroy(ret->pool);
+ PyObject_Del(ret->pool);
+ return NULL;
+ }
if (!check_error(svn_ra_create_callbacks(&callbacks2, ret->pool))) {
apr_pool_destroy(ret->pool);
PyObject_Del(ret);
@@ -766,7 +773,7 @@
return NULL;
}
Py_BEGIN_ALLOW_THREADS
- err = svn_ra_open2(&ret->ra, svn_path_canonicalize(url, ret->pool),
+ err = svn_ra_open2(&ret->ra, ret->url,
callbacks2, ret, config_hash, ret->pool);
Py_END_ALLOW_THREADS
if (!check_error(err)) {
More information about the bazaar-commits
mailing list