From: Tom Yu <tlyu@mit.edu>
Date: Wed, 15 Apr 2009 20:06:29 +0000 (+0000)
Subject: pull up r22107 from trunk
X-Git-Tag: krb5-1.7-beta1~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f928d00996869187b5559e980cc1eecd2cd85039;p=krb5.git

pull up r22107 from trunk

 ------------------------------------------------------------------------
 r22107 | ghudson | 2009-03-17 17:54:51 -0400 (Tue, 17 Mar 2009) | 8 lines
 Changed paths:
    M /trunk/src/lib/krb5/asn.1/asn1_k_decode.c

 ticket: 6427
 subject: Fix error handling issue in ASN.1 decoder
 tags: pullup
 target_version: 1.7

 In asn1_k_decode.c, check the return value of
 end_sequence_of_no_tagvars_helper.

ticket: 6427
version_fixed: 1.7

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22231 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c
index c5d200628..25cc4cc62 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode.c
@@ -364,7 +364,8 @@ end_sequence_of_no_tagvars_helper(asn1buf *buf, asn1buf *seqbufp,
     return retval;
 }
 #define end_sequence_of_no_tagvars(buf) \
-    end_sequence_of_no_tagvars_helper(buf, &seqbuf, seqofindef)
+    retval = end_sequence_of_no_tagvars_helper(buf, &seqbuf, seqofindef); \
+    if (retval) clean_return(retval)
 
 /*
  * Function body for a pointer decoder, which allocates a pointer