Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / stglibs / smux.lib / ber_tlv_length.c

diff --git a/stglibs/smux.lib/ber_tlv_length.c b/stglibs/smux.lib/ber_tlv_length.c
index b87e75e0469887ee7d06bfb5f83b99b8120a5374..32aa5e542ed55c4ad391da6249bc3381827da656 100644 (file)
--- a/stglibs/smux.lib/ber_tlv_length.c
+++ b/stglibs/smux.lib/ber_tlv_length.c
@@ -78,7 +78,6 @@ ssize_t
 ber_skip_length(asn_codec_ctx_t *opt_codec_ctx,
                int _is_constructed, const void *ptr, size_t size) {
        ber_tlv_len_t vlen;     /* Length of V in TLV */
 ber_skip_length(asn_codec_ctx_t *opt_codec_ctx,
                int _is_constructed, const void *ptr, size_t size) {
        ber_tlv_len_t vlen;     /* Length of V in TLV */

-       ssize_t tl;             /* Length of L in TLV */

        ssize_t ll;             /* Length of L in TLV */
        size_t skip;
 
        ssize_t ll;             /* Length of L in TLV */
        size_t skip;
 


@@ -112,7 +111,7 @@ ber_skip_length(asn_codec_ctx_t *opt_codec_ctx,
                ber_tlv_tag_t tag;
 
                /* Fetch the tag */
                ber_tlv_tag_t tag;
 
                /* Fetch the tag */

-               tl = ber_fetch_tag(ptr, size, &tag);
+               ssize_t tl = ber_fetch_tag(ptr, size, &tag);

                if(tl <= 0) return tl;
 
                ll = ber_skip_length(opt_codec_ctx,
                if(tl <= 0) return tl;
 
                ll = ber_skip_length(opt_codec_ctx,