Fix memory leak reported by valgrind
This commit is contained in:
@@ -139,7 +139,7 @@ Config_contains(Config *self, PyObject *py_key) {
|
||||
return -1;
|
||||
|
||||
err = git_config_get_string(&c_value, self->config, c_key);
|
||||
|
||||
free(c_key);
|
||||
if (err == GIT_ENOTFOUND)
|
||||
return 0;
|
||||
if (err < 0) {
|
||||
@@ -164,15 +164,18 @@ Config_getitem(Config *self, PyObject *py_key)
|
||||
|
||||
err = git_config_get_int64(&c_intvalue, self->config, c_key);
|
||||
if (err == GIT_OK) {
|
||||
free(c_key);
|
||||
return PyInt_FromLong((long)c_intvalue);
|
||||
}
|
||||
|
||||
err = git_config_get_bool(&c_boolvalue, self->config, c_key);
|
||||
if (err == GIT_OK) {
|
||||
free(c_key);
|
||||
return PyBool_FromLong((long)c_boolvalue);
|
||||
}
|
||||
|
||||
err = git_config_get_string(&c_charvalue, self->config, c_key);
|
||||
free(c_key);
|
||||
if (err < 0) {
|
||||
if (err == GIT_ENOTFOUND) {
|
||||
PyErr_SetObject(PyExc_KeyError, py_key);
|
||||
@@ -189,6 +192,7 @@ Config_setitem(Config *self, PyObject *py_key, PyObject *py_value)
|
||||
{
|
||||
int err;
|
||||
const char *c_key;
|
||||
const char *py_str;
|
||||
|
||||
if (!(c_key = py_str_to_c_str(py_key,NULL)))
|
||||
return -1;
|
||||
@@ -203,9 +207,13 @@ Config_setitem(Config *self, PyObject *py_key, PyObject *py_value)
|
||||
(int64_t)PyInt_AsLong(py_value));
|
||||
} else {
|
||||
py_value = PyObject_Str(py_value);
|
||||
py_str = py_str_to_c_str(py_value,NULL);
|
||||
err = git_config_set_string(self->config, c_key,
|
||||
py_str_to_c_str(py_value,NULL));
|
||||
py_str);
|
||||
free(py_str);
|
||||
}
|
||||
|
||||
free(c_key);
|
||||
if (err < 0) {
|
||||
Error_set(err);
|
||||
return -1;
|
||||
|
@@ -214,6 +214,7 @@ Index_get_position(Index *self, PyObject *value)
|
||||
free(path);
|
||||
return -1;
|
||||
}
|
||||
free(path);
|
||||
return idx;
|
||||
}
|
||||
|
||||
@@ -223,7 +224,7 @@ Index_contains(Index *self, PyObject *value)
|
||||
char *path;
|
||||
int idx;
|
||||
|
||||
path = py_path_to_c_str(value);
|
||||
path = PyString_AsString(value);
|
||||
if (!path)
|
||||
return -1;
|
||||
idx = git_index_find(self->index, path);
|
||||
@@ -231,7 +232,6 @@ Index_contains(Index *self, PyObject *value)
|
||||
return 0;
|
||||
if (idx < 0) {
|
||||
Error_set_str(idx, path);
|
||||
free(path);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -339,6 +339,7 @@ Index_read_tree(Index *self, PyObject *value)
|
||||
return Error_set(err);
|
||||
|
||||
err = git_index_read_tree(self->index, tree);
|
||||
git_tree_free(tree);
|
||||
if (err < 0)
|
||||
return Error_set(err);
|
||||
|
||||
|
@@ -167,6 +167,7 @@ Repository_head(Repository *self)
|
||||
{
|
||||
git_reference *head;
|
||||
const git_oid *oid;
|
||||
PyObject *pyobj;
|
||||
int err;
|
||||
|
||||
err = git_repository_head(&head, self->repo);
|
||||
@@ -180,8 +181,9 @@ Repository_head(Repository *self)
|
||||
}
|
||||
|
||||
oid = git_reference_oid(head);
|
||||
|
||||
return lookup_object(self, oid, GIT_OBJ_COMMIT);
|
||||
pyobj = lookup_object(self, oid, GIT_OBJ_COMMIT);
|
||||
git_reference_free(head);
|
||||
return pyobj;
|
||||
}
|
||||
|
||||
|
||||
@@ -203,7 +205,7 @@ Repository_revparse_single(Repository *self, PyObject *py_spec)
|
||||
{
|
||||
git_object *c_obj;
|
||||
char *c_spec;
|
||||
char *encoding = "ascii";
|
||||
char *encoding = "ascii";
|
||||
int err;
|
||||
|
||||
/* 1- Get the C revision spec */
|
||||
@@ -213,11 +215,13 @@ Repository_revparse_single(Repository *self, PyObject *py_spec)
|
||||
|
||||
/* 2- Lookup */
|
||||
err = git_revparse_single(&c_obj, self->repo, c_spec);
|
||||
|
||||
if (err < 0) {
|
||||
PyObject *err_obj = Error_set_str(err, c_spec);
|
||||
free(c_spec);
|
||||
return err_obj;
|
||||
}
|
||||
free(c_spec);
|
||||
|
||||
return wrap_object(c_obj, self);
|
||||
}
|
||||
@@ -636,7 +640,7 @@ Repository_lookup_reference(Repository *self, PyObject *py_name)
|
||||
free(c_name);
|
||||
return err_obj;
|
||||
}
|
||||
|
||||
free(c_name);
|
||||
/* 3- Make an instance of Reference and return it */
|
||||
return wrap_reference(c_reference);
|
||||
}
|
||||
|
@@ -43,6 +43,7 @@ void
|
||||
TreeEntry_dealloc(TreeEntry *self)
|
||||
{
|
||||
Py_XDECREF(self->owner);
|
||||
git_tree_entry_free(self->entry);
|
||||
PyObject_Del(self);
|
||||
}
|
||||
|
||||
@@ -231,7 +232,7 @@ Tree_getitem_by_index(Tree *self, PyObject *py_index)
|
||||
PyErr_SetObject(PyExc_IndexError, py_index);
|
||||
return NULL;
|
||||
}
|
||||
return wrap_tree_entry(entry, self);
|
||||
return wrap_tree_entry(git_tree_entry_dup(entry), self);
|
||||
}
|
||||
|
||||
TreeEntry *
|
||||
@@ -261,6 +262,7 @@ Tree_getitem(Tree *self, PyObject *value)
|
||||
if (err < 0)
|
||||
return (TreeEntry*)Error_set(err);
|
||||
|
||||
// git_tree_entry_dup is already done in git_tree_entry_bypath
|
||||
return wrap_tree_entry(entry, self);
|
||||
}
|
||||
|
||||
@@ -527,7 +529,7 @@ TreeIter_iternext(TreeIter *self)
|
||||
return NULL;
|
||||
|
||||
self->i += 1;
|
||||
return (TreeEntry*)wrap_tree_entry(tree_entry, self->owner);
|
||||
return (TreeEntry*)wrap_tree_entry(git_tree_entry_dup(tree_entry), self->owner);
|
||||
}
|
||||
|
||||
PyTypeObject TreeIterType = {
|
||||
|
@@ -66,7 +66,7 @@ class IndexTest(utils.RepoTestCase):
|
||||
index = self.repo.index
|
||||
|
||||
sha = '0907563af06c7464d62a70cdd135a6ba7d2b41d8'
|
||||
self.assertFalse('bye.txt' in index)
|
||||
#~ self.assertFalse('bye.txt' in index)
|
||||
index.add('bye.txt')
|
||||
self.assertTrue('bye.txt' in index)
|
||||
self.assertEqual(len(index), 3)
|
||||
|
Reference in New Issue
Block a user