Skip to content

Commit 18054ac

Browse files
committed
Merge pull request rjancewicz#41 from michaelweiser/kadm5_init_null_deref
Prevent NULL pointer dereference if kadm5_init_with_creds fails
2 parents acf6fc8 + fa38f9c commit 18054ac

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/kadmin.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,6 @@ static PyKAdminObject *_kadmin_init_with_ccache(PyObject *self, PyObject *args)
309309
db_args,
310310
&kadmin->server_handle);
311311

312-
if (retval != KADM5_OK) {
313-
314-
Py_XDECREF(kadmin);
315-
kadmin = NULL;
316-
317-
PyKAdminError_raise_error(retval, "kadm5_init_with_creds");
318-
}
319-
320312

321313
cleanup:
322314

@@ -328,6 +320,14 @@ static PyKAdminObject *_kadmin_init_with_ccache(PyObject *self, PyObject *args)
328320
krb5_free_principal(kadmin->context, princ);
329321
krb5_cc_close(kadmin->context, cc);
330322

323+
if (retval != KADM5_OK) {
324+
325+
Py_XDECREF(kadmin);
326+
kadmin = NULL;
327+
328+
PyKAdminError_raise_error(retval, "kadm5_init_with_creds");
329+
}
330+
331331
if (params)
332332
free(params);
333333

0 commit comments

Comments
 (0)