diff options
author | Andrew Bartlett <abartlet@samba.org> | 2006-03-22 10:16:59 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:59:02 -0500 |
commit | 864d9b531dc2fba94f5ea839b087e28d402c643a (patch) | |
tree | 91f72ed27956be3c0d536d725b0505cba35e3adb /source4/heimdal/lib/krb5/crypto.c | |
parent | 4fd82be1403f873f67eecb8fee457b8de9fc5cd1 (diff) | |
download | samba-864d9b531dc2fba94f5ea839b087e28d402c643a.tar.gz samba-864d9b531dc2fba94f5ea839b087e28d402c643a.tar.bz2 samba-864d9b531dc2fba94f5ea839b087e28d402c643a.zip |
r14635: - Remove lex.c from SVN (it is built anyway, and having it in SVN
confuses things)
- Update Samba4 from lorikeet-heimdal
- Remove generated symlink on make clean
Andrew Bartlett
(This used to be commit a5c2b4cc92e807d18cb8df99bebf004fa4252e1e)
Diffstat (limited to 'source4/heimdal/lib/krb5/crypto.c')
-rw-r--r-- | source4/heimdal/lib/krb5/crypto.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/heimdal/lib/krb5/crypto.c b/source4/heimdal/lib/krb5/crypto.c index 3cfc780eb4..039484c650 100644 --- a/source4/heimdal/lib/krb5/crypto.c +++ b/source4/heimdal/lib/krb5/crypto.c @@ -32,7 +32,7 @@ */ #include "krb5_locl.h" -RCSID("$Id: crypto.c,v 1.132 2006/02/28 14:52:57 lha Exp $"); +RCSID("$Id: crypto.c,v 1.133 2006/03/07 19:34:55 lha Exp $"); #undef CRYPTO_DEBUG #ifdef CRYPTO_DEBUG @@ -3414,7 +3414,7 @@ decrypt_internal_derived(krb5_context context, l = len - et->confoundersize; memmove(p, p + et->confoundersize, l); result->data = realloc(p, l); - if(result->data == NULL) { + if(result->data == NULL && l != 0) { free(p); krb5_set_error_string(context, "malloc: out of memory"); return ENOMEM; @@ -3479,7 +3479,7 @@ decrypt_internal(krb5_context context, l = len - et->confoundersize - checksum_sz; memmove(p, p + et->confoundersize + checksum_sz, l); result->data = realloc(p, l); - if(result->data == NULL) { + if(result->data == NULL && l != 0) { free(p); krb5_set_error_string(context, "malloc: out of memory"); return ENOMEM; @@ -3523,7 +3523,7 @@ decrypt_internal_special(krb5_context context, memmove (p, p + cksum_sz + et->confoundersize, sz); result->data = realloc(p, sz); - if(result->data == NULL) { + if(result->data == NULL && sz != 0) { free(p); krb5_set_error_string(context, "malloc: out of memory"); return ENOMEM; |