summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>1994-07-14 07:40:07 +0000
committerTom Yu <tlyu@mit.edu>1994-07-14 07:40:07 +0000
commitc0936255ab315bd8fafe28b362dfda6b791a6a40 (patch)
treec03baef6cde34e3205a031104d911ccde9460386 /src
parent664cd296a18cc86cb8b27157bc81011cf7b2cf50 (diff)
downloadkrb5-c0936255ab315bd8fafe28b362dfda6b791a6a40.tar.gz
krb5-c0936255ab315bd8fafe28b362dfda6b791a6a40.tar.xz
krb5-c0936255ab315bd8fafe28b362dfda6b791a6a40.zip
* asn1_encode_k.c (asn1_encode_pa_data): oops still check NULL if
length != 0 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3970 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/asn.1/ChangeLog5
-rw-r--r--src/lib/krb5/asn.1/asn1_encode_k.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index c6d64bda3..58699399e 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 14 01:26:22 1994 Tom Yu (tlyu at dragons-lair)
+
+ * asn1_encode_k.c (asn1_encode_pa_data): oops still check NULL if
+ length != 0
+
Sat Jul 9 00:26:48 1994 Tom Yu (tlyu at dragons-lair)
* asn1_encode_k.c (asn1_encode_pa_data): the contents field of a
diff --git a/src/lib/krb5/asn.1/asn1_encode_k.c b/src/lib/krb5/asn.1/asn1_encode_k.c
index 60ea6d5d3..5220c3b2d 100644
--- a/src/lib/krb5/asn.1/asn1_encode_k.c
+++ b/src/lib/krb5/asn.1/asn1_encode_k.c
@@ -640,7 +640,8 @@ asn1_error_code asn1_encode_pa_data(DECLARG(asn1buf *, buf),
{
asn1_setup();
- if(val == NULL) return ASN1_MISSING_FIELD;
+ if(val == NULL || (val->length != 0 && val->contents == NULL))
+ return ASN1_MISSING_FIELD;
asn1_addlenfield(val->length,val->contents,2,asn1_encode_octetstring);
asn1_addfield(val->pa_type,1,asn1_encode_integer);