diff options
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/krb5/krb/serialize.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 4b8f21e86..5cd795478 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 15 22:15:09 1997 Theodore Y. Ts'o <tytso@mit.edu> + + * serialize.c (krb5_register_serializer): Only copy over the old + table when there's an old table to copy over. Otherwise, + BoundsChecker complains about memcpy(foo, NULL, 0). + Tue Mar 25 00:32:55 1997 Theodore Y. Ts'o <tytso@mit.edu> * preauth.c (obtain_sam_padata): Fix handling of the sam-timestamp diff --git a/src/lib/krb5/krb/serialize.c b/src/lib/krb5/krb/serialize.c index 084ecb677..58a88e4ed 100644 --- a/src/lib/krb5/krb/serialize.c +++ b/src/lib/krb5/krb/serialize.c @@ -70,8 +70,9 @@ krb5_register_serializer(kcontext, entry) if ((stable = (krb5_ser_handle) malloc(sizeof(krb5_ser_entry) * (kcontext->ser_ctx_count+1)))) { /* Copy in old table */ - memcpy(stable, kcontext->ser_ctx, - sizeof(krb5_ser_entry) * kcontext->ser_ctx_count); + if (kcontext->ser_ctx_count) + memcpy(stable, kcontext->ser_ctx, + sizeof(krb5_ser_entry) * kcontext->ser_ctx_count); /* Copy in new entry */ memcpy(&stable[kcontext->ser_ctx_count], entry, sizeof(krb5_ser_entry)); |