aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2015-06-10 19:48:51 -0400
committerTom Yu <tlyu@mit.edu>2015-06-24 18:08:09 -0400
commitcda902bf6f4d1e18d541bf3705ae19f783effcae (patch)
treec40b8d6897ac3f0143e89fb2f5aa1be6f95cb278 /src
parent98cf93e21747cc6641475410ccc9f1ba3e17c162 (diff)
downloadkrb5-cda902bf6f4d1e18d541bf3705ae19f783effcae.zip
krb5-cda902bf6f4d1e18d541bf3705ae19f783effcae.tar.gz
krb5-cda902bf6f4d1e18d541bf3705ae19f783effcae.tar.bz2
Tolerate null oid pointer in gss_release_oid()
Under some circumstances, gss_inquire_name() can call gss_release_oid() with a null oid pointer, which currently causes a null dereference. The least invasive fix is for gss_release_oid() to check for the invalid null pointer and return an error, like other GSS-API functions do. (cherry picked from commit 4676e823e6ee9a5731872b31c5588c1b5932e0a3) ticket: 8201 version_fixed: 1.13.3 status: resolved
Diffstat (limited to 'src')
-rw-r--r--src/lib/gssapi/mechglue/g_initialize.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
index 2987164..b7e8a8d 100644
--- a/src/lib/gssapi/mechglue/g_initialize.c
+++ b/src/lib/gssapi/mechglue/g_initialize.c
@@ -168,7 +168,7 @@ gss_OID *oid;
OM_uint32 major;
gss_mech_info aMech;
- if (minor_status == NULL)
+ if (minor_status == NULL || oid == NULL)
return (GSS_S_CALL_INACCESSIBLE_WRITE);
*minor_status = gssint_mechglue_initialize_library();