krb5: Fix UB

2022-10-26 01:54:13 -05:00
parent 5b1c69b424
commit 8e9ad6eda2
6 changed files with 29 additions and 13 deletions
--- a/lib/krb5/salt-aes-sha2.c
+++ b/lib/krb5/salt-aes-sha2.c
@@ -92,8 +92,9 @@ AES_SHA2_string_to_key(krb5_context context,
 	goto cleanup;
    }
    memcpy(saltp.data, et->name, enctypesz);
-    memcpy((unsigned char *)saltp.data + enctypesz,
-	   salt.saltvalue.data, salt.saltvalue.length);
+    if (salt.saltvalue.length)
+        memcpy((unsigned char *)saltp.data + enctypesz,
+               salt.saltvalue.data, salt.saltvalue.length);

    ret = _krb5_aes_sha2_md_for_enctype(context, enctype, &md);
    if (ret)