[SCM] GNU libtasn1 branch, master, updated. libtasn1_4_8-5-ga74525a

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=a74525a5b5b028d71ed9d0a50af7fa1f6ed61645

The branch, master has been updated
       via  a74525a5b5b028d71ed9d0a50af7fa1f6ed61645 (commit)
       via  8b10c845f9ec5730df45c53deb74b1ba187fabd4 (commit)
       via  22787a738c69322cc4b1b6fbabd7b4ee7db61857 (commit)
       via  e965f59066f339d081954c676b2d2f1e6b580dda (commit)
      from  2ff366d078d368b9a6be6831f1041b4d9b995c6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a74525a5b5b028d71ed9d0a50af7fa1f6ed61645
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Apr 20 17:11:13 2016 +0200

    decoding: removed unused constants

commit 8b10c845f9ec5730df45c53deb74b1ba187fabd4
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Apr 20 17:09:03 2016 +0200

    decoding: added null pointer check

commit 22787a738c69322cc4b1b6fbabd7b4ee7db61857
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Apr 20 17:02:48 2016 +0200

    _asn1_append_sequence_set: fail if _asn1_copy_structure3 fails

commit e965f59066f339d081954c676b2d2f1e6b580dda
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Apr 20 16:54:26 2016 +0200

    coding: prevented an unsigned to signed conversion

-----------------------------------------------------------------------

Summary of changes:
 lib/coding.c   |    2 +-
 lib/decoding.c |   13 ++++++++-----
 lib/element.c  |    3 +++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/coding.c b/lib/coding.c
index 0c0f69c..7821d85 100644
--- a/lib/coding.c
+++ b/lib/coding.c
@@ -757,7 +757,7 @@ _asn1_ordering_set (unsigned char *der, int der_len, 
asn1_node node)
       if (err != ASN1_SUCCESS)
        goto error;
 
-      t = class << 24;
+      t = ((unsigned int)class) << 24;
       p_vet->value = t | tag;
       counter += len2;
 
diff --git a/lib/decoding.c b/lib/decoding.c
index e5513a3..cfe2322 100644
--- a/lib/decoding.c
+++ b/lib/decoding.c
@@ -1361,7 +1361,15 @@ asn1_der_decoding2 (asn1_node *element, const void 
*ider, int *max_ider_len,
                        {       /* indefinite length method */
                          p->tmp_ival = -1;
                        }
+
                      p2 = p->down;
+                      if (p2 == NULL)
+                       {
+                         result = ASN1_DER_ERROR;
+                          warn();
+                         goto cleanup;
+                       }
+
                      while ((type_field (p2->type) == ASN1_ETYPE_TAG)
                             || (type_field (p2->type) == ASN1_ETYPE_SIZE))
                        p2 = p2->right;
@@ -1532,11 +1540,6 @@ asn1_der_decoding (asn1_node * element, const void 
*ider, int ider_len,
   return asn1_der_decoding2 (element, ider, &ider_len, 0, errorDescription);
 }
 
-#define FOUND        1
-#define SAME_BRANCH  2
-#define OTHER_BRANCH 3
-#define EXIT         4
-
 /**
  * asn1_der_decoding_element:
  * @structure: pointer to an ASN1 structure
diff --git a/lib/element.c b/lib/element.c
index dceb8ba..b7a0905 100644
--- a/lib/element.c
+++ b/lib/element.c
@@ -152,7 +152,10 @@ _asn1_append_sequence_set (asn1_node node, struct 
node_tail_cache_st *pcache)
   while ((type_field (p->type) == ASN1_ETYPE_TAG)
         || (type_field (p->type) == ASN1_ETYPE_SIZE))
     p = p->right;
+
   p2 = _asn1_copy_structure3 (p);
+  if (p2 == NULL)
+    return ASN1_GENERIC_ERROR;
 
   if (pcache == NULL || pcache->tail == NULL || pcache->head != node)
     {


hooks/post-receive
-- 
GNU libtasn1