diff options
| author | Jeremy Allison <jra@samba.org> | 2010-09-09 15:29:03 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-09-09 15:29:03 -0700 |
| commit | 718fd39f10310d10ebc2276021d97d48f1163a88 (patch) | |
| tree | c3131e859fbf5186596e7f04284095dcde6215c9 /source3/libads/sasl.c | |
| parent | e6b85c2a7b3cfa0dd3c9859c88e5462c616d5a2a (diff) | |
| download | samba-718fd39f10310d10ebc2276021d97d48f1163a88.tar.gz samba-718fd39f10310d10ebc2276021d97d48f1163a88.tar.bz2 samba-718fd39f10310d10ebc2276021d97d48f1163a88.zip | |
Fox missing SMB_MALLOC return checks noticed by "Andreas Moroder <andreas.moroder@gmx.net>".
Jeremy.
Diffstat (limited to 'source3/libads/sasl.c')
| -rw-r--r-- | source3/libads/sasl.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c index 7ad4c9a868..051fc961d9 100644 --- a/source3/libads/sasl.c +++ b/source3/libads/sasl.c @@ -987,6 +987,11 @@ static ADS_STATUS ads_sasl_gssapi_do_bind(ADS_STRUCT *ads, const gss_name_t serv output_token.length = 4; output_token.value = SMB_MALLOC(output_token.length); + if (!output_token.value) { + output_token.length = 0; + status = ADS_ERROR_NT(NT_STATUS_NO_MEMORY); + goto failed; + } p = (uint8 *)output_token.value; RSIVAL(p,0,max_msg_size); @@ -1002,14 +1007,19 @@ static ADS_STATUS ads_sasl_gssapi_do_bind(ADS_STRUCT *ads, const gss_name_t serv */ gss_rc = gss_wrap(&minor_status, context_handle,0,GSS_C_QOP_DEFAULT, - &output_token, &conf_state, - &input_token); + &output_token, /* used as *input* here. */ + &conf_state, + &input_token); /* Used as *output* here. */ if (gss_rc) { status = ADS_ERROR_GSS(gss_rc, minor_status); + output_token.length = 0; + SAFE_FREE(output_token.value); goto failed; } - free(output_token.value); + /* We've finished with output_token. */ + SAFE_FREE(output_token.value); + output_token.length = 0; cred.bv_val = (char *)input_token.value; cred.bv_len = input_token.length; |