35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 6843c44a45044808f90687f85183e7111a465d1f Mon Sep 17 00:00:00 2001
|
|
From: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
Date: Thu, 16 Jun 2022 10:33:29 +1200
|
|
Subject: [PATCH 56/99] heimdal:kdc: Accommodate NULL data parameter in
|
|
krb5_pac_get_buffer()
|
|
|
|
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
---
|
|
source4/heimdal/lib/krb5/pac.c | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/source4/heimdal/lib/krb5/pac.c b/source4/heimdal/lib/krb5/pac.c
|
|
index 05bcc523080..100de904662 100644
|
|
--- a/source4/heimdal/lib/krb5/pac.c
|
|
+++ b/source4/heimdal/lib/krb5/pac.c
|
|
@@ -394,10 +394,12 @@ krb5_pac_get_buffer(krb5_context context, krb5_pac p,
|
|
if (p->pac->buffers[i].type != type)
|
|
continue;
|
|
|
|
- ret = krb5_data_copy(data, (unsigned char *)p->data.data + offset, len);
|
|
- if (ret) {
|
|
- krb5_set_error_message(context, ret, N_("malloc: out of memory", ""));
|
|
- return ret;
|
|
+ if (data) {
|
|
+ ret = krb5_data_copy(data, (unsigned char *)p->data.data + offset, len);
|
|
+ if (ret) {
|
|
+ krb5_set_error_message(context, ret, N_("malloc: out of memory", ""));
|
|
+ return ret;
|
|
+ }
|
|
}
|
|
return 0;
|
|
}
|
|
--
|
|
2.25.1
|