From 89cf441e8d16c1a18ee58a11350952b89dc08ea1 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Thu, 3 Mar 2022 10:11:32 +1100 Subject: [PATCH] Revert "lib/krb5: re-allow data->length == 0 in krb5_pac_add_buffer()" This reverts commit f3301fc94c009313188bafa6670236d678d60e5d. --- lib/krb5/pac.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/krb5/pac.c b/lib/krb5/pac.c index 4a3ebf891..7df2ba5ee 100644 --- a/lib/krb5/pac.c +++ b/lib/krb5/pac.c @@ -383,7 +383,7 @@ krb5_pac_add_buffer(krb5_context context, krb5_pac p, size_t len, offset, header_end, old_end; uint32_t i; - assert(data->length == 0 || (data->length > 0 && data->data != NULL)); + assert(data->length > 0 && data->data != NULL); len = p->pac->numbuffers; @@ -433,9 +433,8 @@ krb5_pac_add_buffer(krb5_context context, krb5_pac p, * copy in new data part */ - if (data->length != 0) - memcpy((unsigned char *)p->data.data + offset, - data->data, data->length); + memcpy((unsigned char *)p->data.data + offset, + data->data, data->length); memset((unsigned char *)p->data.data + offset + data->length, 0, p->data.length - offset - data->length);