Clean up reference used with PyDict_Setxxx

PyDictSetxxx methods don't steal reference so if the items added
to the dictionary were created just for the purpose of inserting
into the dict then we need to decref them.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Thu Feb  7 17:17:46 CET 2019 on sn-devel-144

diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c
index 66f0381722057a51305c6b569f52cd8fb51189c7..30273141eb7e94f70428c5e27bbc16d91f0c7c0f 100644 (file)
--- a/source3/passdb/py_passdb.c
+++ b/source3/passdb/py_passdb.c
@@ -1483,6 +1483,8 @@ static PyObject *py_pdb_domain_info(PyObject *self, PyObject *args)
        PyObject *py_domain_info;
        struct dom_sid *sid;
        struct GUID *guid;
+       PyObject *py_dom_sid = NULL;
+       PyObject *py_guid = NULL;
 
        methods = pytalloc_get_ptr(self);
 
@@ -1506,18 +1508,20 @@ static PyObject *py_pdb_domain_info(PyObject *self, PyObject *args)
        }
        *guid = domain_info->guid;
 
-       if ((py_domain_info = PyDict_New()) == NULL) {
-               PyErr_NoMemory();
-               talloc_free(frame);
-               return NULL;
-       }
+       py_dom_sid = pytalloc_steal(dom_sid_Type, sid);
+       py_guid = pytalloc_steal(guid_Type, guid);
+
+       py_domain_info = Py_BuildValue(
+               "{s:s, s:s, s:s, s:O, s:O}",
+               "name", domain_info->name,
+               "dns_domain", domain_info->dns_domain,
+               "dns_forest", domain_info->dns_forest,
+               "dom_sid", py_dom_sid,
+               "guid", py_guid);
 
-       PyDict_SetItemString(py_domain_info, "name", PyStr_FromString(domain_info->name));
-       PyDict_SetItemString(py_domain_info, "dns_domain", PyStr_FromString(domain_info->dns_domain));
-       PyDict_SetItemString(py_domain_info, "dns_forest", PyStr_FromString(domain_info->dns_forest));
-       PyDict_SetItemString(py_domain_info, "dom_sid", pytalloc_steal(dom_sid_Type, sid));
-       PyDict_SetItemString(py_domain_info, "guid", pytalloc_steal(guid_Type, guid));
 
+       Py_CLEAR(py_dom_sid);
+       Py_CLEAR(py_guid);
        talloc_free(frame);
        return py_domain_info;
 }
@@ -2396,19 +2400,11 @@ static PyObject *py_pdb_get_aliasinfo(PyObject *self, PyObject *args)
                return NULL;
        }
 
-       py_alias_info = PyDict_New();
-       if (py_alias_info == NULL) {
-               PyErr_NoMemory();
-               talloc_free(frame);
-               return NULL;
-       }
-
-       PyDict_SetItemString(py_alias_info, "acct_name",
-                            PyStr_FromString(alias_info->acct_name));
-       PyDict_SetItemString(py_alias_info, "acct_desc",
-                            PyStr_FromString(alias_info->acct_desc));
-       PyDict_SetItemString(py_alias_info, "rid",
-                            PyInt_FromLong(alias_info->rid));
+       py_alias_info = Py_BuildValue(
+               "{s:s, s:s, s:l}",
+               "acct_name", alias_info->acct_name,
+               "acct_desc", alias_info->acct_desc,
+               "rid", alias_info->rid);
 
        talloc_free(frame);
        return py_alias_info;
@@ -2613,7 +2609,20 @@ static PyObject *py_pdb_get_account_policy(PyObject *self, PyObject *unused)
                type = account_policy_name_to_typenum(names[i]);
                status = methods->get_account_policy(methods, type, &value);
                if (NT_STATUS_IS_OK(status)) {
-                       PyDict_SetItemString(py_acct_policy, names[i], Py_BuildValue("i", value));
+                       int res = 0;
+                       PyObject *py_value = Py_BuildValue("i", value);
+                       if (py_value == NULL) {
+                               Py_CLEAR(py_acct_policy);
+                               break;
+                       }
+                       res = PyDict_SetItemString(py_acct_policy,
+                                                  names[i],
+                                                  py_value);
+                       Py_CLEAR(py_value);
+                       if (res == -1) {
+                               Py_CLEAR(py_acct_policy);
+                               break;
+                       }
                }
        }
 
@@ -2701,28 +2710,30 @@ static PyObject *py_pdb_search_users(PyObject *self, PyObject *args)
        }
 
        while (search->next_entry(search, entry)) {
-               py_dict = PyDict_New();
+               int res = 1;
+               py_dict = Py_BuildValue(
+                       "{s:l, s:l, s:l, s:s, s:s, s:s}",
+                       "idx", entry->idx,
+                       "rid", entry->rid,
+                       "acct_flags", entry->acct_flags,
+                       "account_name", entry->account_name,
+                       "fullname", entry->fullname,
+                       "description", entry->description);
                if (py_dict == NULL) {
-                       PyErr_NoMemory();
-               } else {
-                       int res = 0;
-                       PyDict_SetItemString(py_dict, "idx", PyInt_FromLong(entry->idx));
-                       PyDict_SetItemString(py_dict, "rid", PyInt_FromLong(entry->rid));
-                       PyDict_SetItemString(py_dict, "acct_flags", PyInt_FromLong(entry->acct_flags));
-                       PyDict_SetItemString(py_dict, "account_name", PyStr_FromString(entry->account_name));
-                       PyDict_SetItemString(py_dict, "fullname", PyStr_FromString(entry->fullname));
-                       PyDict_SetItemString(py_dict, "description", PyStr_FromString(entry->description));
-                       res = PyList_Append(py_userlist, py_dict);
-                       Py_CLEAR(py_dict);
-                       if (res == -1) {
-                               Py_CLEAR(py_userlist);
-                               talloc_free(frame);
-                               return NULL;
-                       }
+                       Py_CLEAR(py_userlist);
+                       goto out;
+               }
+
+               res = PyList_Append(py_userlist, py_dict);
+               Py_CLEAR(py_dict);
+               if (res == -1) {
+                       Py_CLEAR(py_userlist);
+                       goto out;
                }
        }
        search->search_end(search);
 
+out:
        talloc_free(frame);
        return py_userlist;
 }
@@ -2766,28 +2777,30 @@ static PyObject *py_pdb_search_groups(PyObject *self, PyObject *unused)
        }
 
        while (search->next_entry(search, entry)) {
-               py_dict = PyDict_New();
+               int res = 0;
+               py_dict = Py_BuildValue(
+                       "{s:l, s:l, s:l, s:s, s:s, s:s}",
+                       "idx", entry->idx,
+                       "rid", entry->rid,
+                       "acct_flags", entry->acct_flags,
+                       "account_name", entry->account_name,
+                       "fullname", entry->fullname,
+                       "description", entry->description);
+
                if (py_dict == NULL) {
-                       PyErr_NoMemory();
-               } else {
-                       int res = 0;
-                       PyDict_SetItemString(py_dict, "idx", PyInt_FromLong(entry->idx));
-                       PyDict_SetItemString(py_dict, "rid", PyInt_FromLong(entry->rid));
-                       PyDict_SetItemString(py_dict, "acct_flags", PyInt_FromLong(entry->acct_flags));
-                       PyDict_SetItemString(py_dict, "account_name", PyStr_FromString(entry->account_name));
-                       PyDict_SetItemString(py_dict, "fullname", PyStr_FromString(entry->fullname));
-                       PyDict_SetItemString(py_dict, "description", PyStr_FromString(entry->description));
-                       res = PyList_Append(py_grouplist, py_dict);
-                       Py_CLEAR(py_dict);
-                       if (res == -1) {
-                               talloc_free(frame);
-                               Py_CLEAR(py_grouplist);
-                               return NULL;
-                       }
+                       Py_CLEAR(py_grouplist);
+                       goto out;
+               }
+
+               res = PyList_Append(py_grouplist, py_dict);
+               Py_CLEAR(py_dict);
+               if (res == -1) {
+                       Py_CLEAR(py_grouplist);
+                       goto out;
                }
        }
        search->search_end(search);
-
+out:
        talloc_free(frame);
        return py_grouplist;
 }
@@ -2844,28 +2857,30 @@ static PyObject *py_pdb_search_aliases(PyObject *self, PyObject *args)
        }
 
        while (search->next_entry(search, entry)) {
-               py_dict = PyDict_New();
+               int res = 0;
+
+               py_dict = Py_BuildValue(
+                       "{s:l, s:l, s:l, s:s, s:s, s:s}",
+                       "idx", entry->idx,
+                       "rid", entry->rid,
+                       "acct_flags", entry->acct_flags,
+                       "account_name", entry->account_name,
+                       "fullname", entry->fullname,
+                       "description", entry->description);
+
                if (py_dict == NULL) {
-                       PyErr_NoMemory();
-               } else {
-                       int res = 0;
-                       PyDict_SetItemString(py_dict, "idx", PyInt_FromLong(entry->idx));
-                       PyDict_SetItemString(py_dict, "rid", PyInt_FromLong(entry->rid));
-                       PyDict_SetItemString(py_dict, "acct_flags", PyInt_FromLong(entry->acct_flags));
-                       PyDict_SetItemString(py_dict, "account_name", PyStr_FromString(entry->account_name));
-                       PyDict_SetItemString(py_dict, "fullname", PyStr_FromString(entry->fullname));
-                       PyDict_SetItemString(py_dict, "description", PyStr_FromString(entry->description));
-                       res = PyList_Append(py_aliaslist, py_dict);
-                       Py_CLEAR(py_dict);
-                       if (res == -1) {
-                               Py_CLEAR(py_aliaslist);
-                               talloc_free(frame);
-                               return NULL;
-                       }
+                       Py_CLEAR(py_aliaslist);
+                       goto out;
+               }
+               res = PyList_Append(py_aliaslist, py_dict);
+               Py_CLEAR(py_dict);
+               if (res == -1) {
+                       Py_CLEAR(py_aliaslist);
+                       goto out;
                }
        }
        search->search_end(search);
-
+out:
        talloc_free(frame);
        return py_aliaslist;
 }
@@ -3034,17 +3049,13 @@ static PyObject *py_pdb_get_trusteddom_pw(PyObject *self, PyObject *args)
                return NULL;
        }
 
-       py_value = PyDict_New();
-       if (py_value == NULL) {
-               PyErr_NoMemory();
-               talloc_free(frame);
-               return NULL;
-       }
-
-       PyDict_SetItemString(py_value, "pwd", PyStr_FromString(pwd));
-       PyDict_SetItemString(py_value, "sid", py_sid);
-       PyDict_SetItemString(py_value, "last_set_tim", PyInt_FromLong(last_set_time));
+       py_value = Py_BuildValue(
+               "{s:s, s:O, s:l}",
+               "pwd", pwd,
+               "sid", py_sid,
+               "last_set_tim", last_set_time);
 
+       Py_CLEAR(py_sid);
        talloc_free(frame);
        return py_value;
 }
@@ -3134,20 +3145,24 @@ static PyObject *py_pdb_enum_trusteddoms(PyObject *self, PyObject *unused)
 
        for(i=0; i<num_domains; i++) {
                int res = 0;
-               py_dict = PyDict_New();
-               if (py_dict) {
-                       PyDict_SetItemString(py_dict, "name",
-                                       PyStr_FromString(domains[i]->name));
-                       PyDict_SetItemString(py_dict, "sid",
-                                       pytalloc_steal(dom_sid_Type, &domains[i]->sid));
+               PyObject *py_sid =
+                       pytalloc_steal(dom_sid_Type, &domains[i]->sid);
+               py_dict = Py_BuildValue(
+                       "{s:s, s:O}",
+                       "name", domains[i]->name,
+                       "sid", py_sid);
+               Py_CLEAR(py_sid);
+               if (py_dict == NULL) {
+                       DBG_ERR("Failed to insert entry to dict\n");
+                               Py_CLEAR(py_domain_list);
+                               break;
                }
 
                res = PyList_Append(py_domain_list, py_dict);
                Py_CLEAR(py_dict);
                if (res == -1) {
-                       Py_CLEAR(py_dict);
-                       talloc_free(frame);
-                       return NULL;
+                       Py_CLEAR(py_domain_list);
+                       break;
                }
        }
 
@@ -3164,6 +3179,7 @@ static PyObject *py_pdb_get_trusted_domain(PyObject *self, PyObject *args)
        const char *domain;
        struct pdb_trusted_domain *td;
        PyObject *py_domain_info;
+       PyObject *py_sid = NULL;
 
        if (!PyArg_ParseTuple(args, "s:get_trusted_domain", &domain)) {
                talloc_free(frame);
@@ -3181,34 +3197,30 @@ static PyObject *py_pdb_get_trusted_domain(PyObject *self, PyObject *args)
                return NULL;
        }
 
-       py_domain_info = PyDict_New();
-       if (py_domain_info == NULL) {
-               PyErr_NoMemory();
-               talloc_free(frame);
-               return NULL;
-       }
+       py_sid = pytalloc_steal(dom_sid_Type, &td->security_identifier);
 
-       PyDict_SetItemString(py_domain_info, "domain_name",
-                       PyStr_FromString(td->domain_name));
-       PyDict_SetItemString(py_domain_info, "netbios_name",
-                       PyStr_FromString(td->netbios_name));
-       PyDict_SetItemString(py_domain_info, "security_identifier",
-                       pytalloc_steal(dom_sid_Type, &td->security_identifier));
-       PyDict_SetItemString(py_domain_info, "trust_auth_incoming",
-                       PyBytes_FromStringAndSize((const char *)td->trust_auth_incoming.data,
-                                               td->trust_auth_incoming.length));
-       PyDict_SetItemString(py_domain_info, "trust_auth_outgoing",
-                       PyBytes_FromStringAndSize((const char *)td->trust_auth_outgoing.data,
-                                               td->trust_auth_outgoing.length));
-       PyDict_SetItemString(py_domain_info, "trust_direction",
-                       PyInt_FromLong(td->trust_direction));
-       PyDict_SetItemString(py_domain_info, "trust_type",
-                       PyInt_FromLong(td->trust_type));
-       PyDict_SetItemString(py_domain_info, "trust_attributes",
-                       PyInt_FromLong(td->trust_attributes));
-       PyDict_SetItemString(py_domain_info, "trust_forest_trust_info",
-                       PyBytes_FromStringAndSize((const char *)td->trust_forest_trust_info.data,
-                                               td->trust_forest_trust_info.length));
+       py_domain_info = Py_BuildValue(
+               "{s:s, s:s, s:O,"
+                       " s:"PYARG_BYTES_LEN","
+                       " s:"PYARG_BYTES_LEN","
+                       " s:l, s:l, s:l,"
+                       " s:"PYARG_BYTES_LEN"}",
+               "domain_name", td->domain_name,
+               "netbios_name", td->netbios_name,
+               "security_identifier", py_sid,
+               "trust_auth_incoming",
+                       (const char *)td->trust_auth_incoming.data,
+                       td->trust_auth_incoming.length,
+               "trust_auth_outgoing",
+                       (const char *)td->trust_auth_outgoing.data,
+                       td->trust_auth_outgoing.length,
+               "trust_direction", td->trust_direction,
+               "trust_type", td->trust_type,
+               "trust_attributes", td->trust_attributes,
+               "trust_forest_trust_info",
+                       (const char *)td->trust_forest_trust_info.data,
+                       td->trust_forest_trust_info.length);
+       Py_CLEAR(py_sid);
 
        talloc_free(frame);
        return py_domain_info;
@@ -3224,6 +3236,7 @@ static PyObject *py_pdb_get_trusted_domain_by_sid(PyObject *self, PyObject *args
        struct dom_sid *domain_sid;
        struct pdb_trusted_domain *td;
        PyObject *py_domain_info;
+       PyObject *py_sid = NULL;
 
        if (!PyArg_ParseTuple(args, "O!:get_trusted_domain_by_sid", dom_sid_Type, &py_domain_sid)) {
                talloc_free(frame);
@@ -3243,34 +3256,30 @@ static PyObject *py_pdb_get_trusted_domain_by_sid(PyObject *self, PyObject *args
                return NULL;
        }
 
-       py_domain_info = PyDict_New();
-       if (py_domain_info == NULL) {
-               PyErr_NoMemory();
-               talloc_free(frame);
-               return NULL;
-       }
+       py_sid = pytalloc_steal(dom_sid_Type, &td->security_identifier);
 
-       PyDict_SetItemString(py_domain_info, "domain_name",
-                       PyStr_FromString(td->domain_name));
-       PyDict_SetItemString(py_domain_info, "netbios_name",
-                       PyStr_FromString(td->netbios_name));
-       PyDict_SetItemString(py_domain_info, "security_identifier",
-                       pytalloc_steal(dom_sid_Type, &td->security_identifier));
-       PyDict_SetItemString(py_domain_info, "trust_auth_incoming",
-                       PyBytes_FromStringAndSize((char *)td->trust_auth_incoming.data,
-                                               td->trust_auth_incoming.length));
-       PyDict_SetItemString(py_domain_info, "trust_auth_outgoing",
-                       PyBytes_FromStringAndSize((char *)td->trust_auth_outgoing.data,
-                                               td->trust_auth_outgoing.length));
-       PyDict_SetItemString(py_domain_info, "trust_direction",
-                       PyInt_FromLong(td->trust_direction));
-       PyDict_SetItemString(py_domain_info, "trust_type",
-                       PyInt_FromLong(td->trust_type));
-       PyDict_SetItemString(py_domain_info, "trust_attributes",
-                       PyInt_FromLong(td->trust_attributes));
-       PyDict_SetItemString(py_domain_info, "trust_forest_trust_info",
-                       PyBytes_FromStringAndSize((char *)td->trust_forest_trust_info.data,
-                                               td->trust_forest_trust_info.length));
+       py_domain_info = Py_BuildValue(
+               "{s:s, s:s, s:O,"
+                       " s:"PYARG_BYTES_LEN","
+                       " s:"PYARG_BYTES_LEN","
+                       " s:l, s:l, s:l,"
+                       " s:"PYARG_BYTES_LEN"}",
+               "domain_name", td->domain_name,
+               "netbios_name", td->netbios_name,
+               "security_identifier", py_sid,
+               "trust_auth_incoming",
+                       (const char *)td->trust_auth_incoming.data,
+                       td->trust_auth_incoming.length,
+               "trust_auth_outgoing",
+                       (const char *)td->trust_auth_outgoing.data,
+                       td->trust_auth_outgoing.length,
+               "trust_direction", td->trust_direction,
+               "trust_type", td->trust_type,
+               "trust_attributes", td->trust_attributes,
+               "trust_forest_trust_info",
+                       (const char *)td->trust_forest_trust_info.data,
+                       td->trust_forest_trust_info.length);
+       Py_CLEAR(py_sid);
 
        talloc_free(frame);
        return py_domain_info;
@@ -3373,7 +3382,7 @@ static PyObject *py_pdb_enum_trusted_domains(PyObject *self, PyObject *args)
        NTSTATUS status;
        struct pdb_methods *methods;
        uint32_t num_domains;
-       struct pdb_trusted_domain **td_info, *td;
+       struct pdb_trusted_domain **td_info;
        PyObject *py_td_info, *py_domain_info;
        int i;
 
@@ -3397,43 +3406,42 @@ static PyObject *py_pdb_enum_trusted_domains(PyObject *self, PyObject *args)
 
        for (i=0; i<num_domains; i++) {
                int res = 0;
-               py_domain_info = PyDict_New();
+               struct pdb_trusted_domain *td = td_info[i];
+               PyObject *py_sid =
+                       pytalloc_steal(dom_sid_Type, &td->security_identifier);
+
+               py_domain_info = Py_BuildValue(
+                       "{s:s, s:s, s:O,"
+                               " s:"PYARG_BYTES_LEN","
+                               " s:"PYARG_BYTES_LEN","
+                               " s:l, s:l, s:l,"
+                               " s:"PYARG_BYTES_LEN"}",
+                       "domain_name", td->domain_name,
+                       "netbios_name", td->netbios_name,
+                       "security_identifier", py_sid,
+                       "trust_auth_incoming",
+                               (const char *)td->trust_auth_incoming.data,
+                               td->trust_auth_incoming.length,
+                       "trust_auth_outgoing",
+                               (const char *)td->trust_auth_outgoing.data,
+                               td->trust_auth_outgoing.length,
+                       "trust_direction", td->trust_direction,
+                       "trust_type", td->trust_type,
+                       "trust_attributes", td->trust_attributes,
+                       "trust_forest_trust_info",
+                               (const char *)td->trust_forest_trust_info.data,
+                               td->trust_forest_trust_info.length);
+               Py_CLEAR(py_sid);
+
                if (py_domain_info == NULL) {
-                       PyErr_NoMemory();
-                       Py_DECREF(py_td_info);
-                       talloc_free(frame);
-                       return NULL;
+                       Py_CLEAR(py_td_info);
+                       break;
                }
-
-               td = td_info[i];
-
-               PyDict_SetItemString(py_domain_info, "domain_name",
-                               PyStr_FromString(td->domain_name));
-               PyDict_SetItemString(py_domain_info, "netbios_name",
-                               PyStr_FromString(td->netbios_name));
-               PyDict_SetItemString(py_domain_info, "security_identifier",
-                               pytalloc_steal(dom_sid_Type, &td->security_identifier));
-               PyDict_SetItemString(py_domain_info, "trust_auth_incoming",
-                               PyBytes_FromStringAndSize((const char *)td->trust_auth_incoming.data,
-                                                       td->trust_auth_incoming.length));
-               PyDict_SetItemString(py_domain_info, "trust_auth_outgoing",
-                               PyBytes_FromStringAndSize((const char *)td->trust_auth_outgoing.data,
-                                                       td->trust_auth_outgoing.length));
-               PyDict_SetItemString(py_domain_info, "trust_direction",
-                               PyInt_FromLong(td->trust_direction));
-               PyDict_SetItemString(py_domain_info, "trust_type",
-                               PyInt_FromLong(td->trust_type));
-               PyDict_SetItemString(py_domain_info, "trust_attributes",
-                               PyInt_FromLong(td->trust_attributes));
-               PyDict_SetItemString(py_domain_info, "trust_forest_trust_info",
-                               PyBytes_FromStringAndSize((const char *)td->trust_forest_trust_info.data,
-                                                       td->trust_forest_trust_info.length));
                res = PyList_Append(py_td_info, py_domain_info);
                Py_CLEAR(py_domain_info);
                if (res == -1) {
-                       Py_CLEAR(py_domain_info);
-                       talloc_free(frame);
-                       return NULL;
+                       Py_CLEAR(py_td_info);
+                       break;
                }
        }
 
@@ -3484,24 +3492,25 @@ static PyObject *py_pdb_get_secret(PyObject *self, PyObject *args)
                return NULL;
        }
 
-       py_secret = PyDict_New();
+       py_secret = Py_BuildValue(
+               "{s:"PYARG_BYTES_LEN","
+                       " s:K"
+                       " s:"PYARG_BYTES_LEN","
+                       " s:K, s:O}",
+               "secret_current", (const char*)secret_current.data,
+                               secret_current.length,
+               "secret_current_lastchange", secret_current_lastchange,
+               "secret_old", (const char*)secret_old.data,
+                               secret_old.length,
+               "secret_old_lastchange", secret_old_lastchange,
+               "sd", py_sd);
+
+       Py_CLEAR(py_sd);
        if (py_secret == NULL) {
-               PyErr_NoMemory();
-               Py_DECREF(py_sd);
                talloc_free(frame);
                return NULL;
        }
 
-       PyDict_SetItemString(py_secret, "secret_current",
-                       PyBytes_FromStringAndSize((const char*)secret_current.data, secret_current.length));
-       PyDict_SetItemString(py_secret, "secret_current_lastchange",
-                       PyLong_FromUnsignedLongLong(secret_current_lastchange));
-       PyDict_SetItemString(py_secret, "secret_old",
-                       PyBytes_FromStringAndSize((const char*)secret_old.data, secret_old.length));
-       PyDict_SetItemString(py_secret, "secret_old_lastchange",
-                       PyLong_FromUnsignedLongLong(secret_old_lastchange));
-       PyDict_SetItemString(py_secret, "sd", py_sd);
-
        talloc_free(frame);
        return py_secret;
 }
@@ -3817,12 +3826,15 @@ static PyObject *py_passdb_backends(PyObject *self, PyObject *unused)
                PyObject *entry_name = PyStr_FromString(entry->name);
                if (entry_name) {
                        res = PyList_Append(py_blist, entry_name);
+               } else {
+                       Py_CLEAR(entry_name);
+                       Py_CLEAR(py_blist);
+                       break;
                }
                Py_CLEAR(entry_name);
                if (res == -1) {
                        Py_CLEAR(py_blist);
-                       talloc_free(frame);
-                       return NULL;
+                       break;
                }
                entry = entry->next;
        }

diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c
index e3c1fd598890d3cab9c3b347d9d41d53e1d3cf16..255ec656330f409202863bb72a2e0edef127be28 100644 (file)
--- a/source4/dsdb/pydsdb.c
+++ b/source4/dsdb/pydsdb.c
@@ -880,11 +880,10 @@ static PyObject *py_dsdb_load_partition_usn(PyObject *self, PyObject *args)
 
        talloc_free(mem_ctx);
 
-       result = PyDict_New();
-
-       PyDict_SetItemString(result, "uSNHighest", PyInt_FromLong((uint64_t)highest_uSN));
-       PyDict_SetItemString(result, "uSNUrgent", PyInt_FromLong((uint64_t)urgent_uSN));
-
+       result = Py_BuildValue(
+                       "{s:l, s:l}",
+                       "uSNHighest", (uint64_t)highest_uSN,
+                       "uSNUrgent", (uint64_t)urgent_uSN);
 
        return result;
 }

diff --git a/source4/librpc/ndr/py_auth.c b/source4/librpc/ndr/py_auth.c
index b534e79b63196758c9eb65b9947de25b1474e80f..d34a852c06ddea4cddd33e1cf389a580ad9926b9 100644 (file)
--- a/source4/librpc/ndr/py_auth.c
+++ b/source4/librpc/ndr/py_auth.c
@@ -38,6 +38,7 @@ static void PyType_AddGetSet(PyTypeObject *type, PyGetSetDef *getset)
                descr = PyDescr_NewGetSet(type, &getset[i]);
                PyDict_SetItemString(dict, getset[i].name, 
                                     descr);
+               Py_CLEAR(descr);
        }
 }
 

diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c
index eb5224dc243759ccd2d30416341a5e456b31d10f..f6aabc740ce94a73ef9607617fcb34c0d41aecdb 100644 (file)
--- a/source4/librpc/ndr/py_security.c
+++ b/source4/librpc/ndr/py_security.c
@@ -36,6 +36,7 @@ static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods)
                        descr = PyDescr_NewMethod(type, &methods[i]);
                PyDict_SetItemString(dict, methods[i].ml_name, 
                                     descr);
+               Py_CLEAR(descr);
        }
 }
 

diff --git a/source4/librpc/ndr/py_xattr.c b/source4/librpc/ndr/py_xattr.c
index 4ebf1358c556b75580d949ac7f580afa3dd57bf7..4052399becea0113201ae1d188859393f4a56baf 100644 (file)
--- a/source4/librpc/ndr/py_xattr.c
+++ b/source4/librpc/ndr/py_xattr.c
@@ -34,6 +34,7 @@ static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods)
                         descr = PyDescr_NewMethod(type, &methods[i]);
                 PyDict_SetItemString(dict, methods[i].ml_name,
                                      descr);
+               Py_CLEAR(descr);
         }
 }
 

diff --git a/source4/librpc/rpc/pyrpc_util.c b/source4/librpc/rpc/pyrpc_util.c
index 29fd281f54daddac19925730c4777318a3a07bc2..8d5ec45817fd6357728ae88d55f94c4ceec8d3a8 100644 (file)
--- a/source4/librpc/rpc/pyrpc_util.c
+++ b/source4/librpc/rpc/pyrpc_util.c
@@ -339,6 +339,7 @@ bool PyInterface_AddNdrRpcMethods(PyTypeObject *ifacetype, const struct PyNdrRpc
 
                PyDict_SetItemString(ifacetype->tp_dict, mds[i].name, 
                                     (PyObject *)ret);
+               Py_CLEAR(ret);
        }
 
        return true;