开源软件构建与测试

_service:tar_scm:libtasn1.spec Changed

_service:tar_scm:backport-CVE-2021-46848-Fix-ETYPE_OK-off-by-one-array-size-check-Closes-32.patch Deleted

@@ -1,29 +0,0 @@
-From 44a700d2051a666235748970c2df047ff207aeb5 Mon Sep 17 00:00:00 2001
-From: Simon Josefsson <simon@josefsson.org>
-Date: Wed, 17 Aug 2022 12:25:06 +0200
-Subject: PATCH Fix ETYPE_OK off by one array size check.  Closes: #32.
-
-Reported by David Trabish in
-<https://gitlab.com/gnutls/libtasn1/-/issues/32>.
-
-Signed-off-by: Simon Josefsson <simon@josefsson.org>
----
- lib/int.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletion(-)
-
-diff --git a/lib/int.h b/lib/int.h
-index 488c118..d94d51c 100644
---- a/lib/int.h
-+++ b/lib/int.h
-@@ -97,7 +97,7 @@ typedef struct tag_and_class_st
- #define ETYPE_TAG(etype) (_asn1_tagsetype.tag)
- #define ETYPE_CLASS(etype) (_asn1_tagsetype.class)
- #define ETYPE_OK(etype) (((etype) != ASN1_ETYPE_INVALID && \
--                          (etype) <= _asn1_tags_size && \
-+                          (etype) < _asn1_tags_size && \
-                           _asn1_tags(etype).desc != NULL)?1:0)
- 
- #define ETYPE_IS_STRING(etype) ((etype == ASN1_ETYPE_GENERALSTRING || \
--- 
-2.27.0
-

_service:tar_scm:fix-memleaks-in-asn1-arrat2tree.patch Changed

@@ -5,24 +5,24 @@
 
 ---
  lib/parser_aux.c |  2 +-
- lib/structure.c  | 20 +++++++++----
+ lib/structure.c  | 20 ++++++++++++++------
  2 files changed, 15 insertions(+), 7 deletions(-)
 
 diff --git a/lib/parser_aux.c b/lib/parser_aux.c
-index d5dbbf8..071f1be 100644
+index c05bd23..e5e4cc3 100644
 --- a/lib/parser_aux.c
 +++ b/lib/parser_aux.c
-@@ -767,7 +767,7 @@ _asn1_expand_object_id (list_type **list, asn1_node node)
+@@ -766,7 +766,7 @@ _asn1_expand_object_id (list_type ** list, asn1_node node)
  			return ASN1_ELEMENT_NOT_FOUND;
  
  		      _asn1_set_down (p, p2->right);
 -		      if (p2->down)
-+                     while (p2->down)
++		      while (p2->down)
  			_asn1_delete_structure (*list, &p2->down, 0);
- 		      _asn1_delete_node_from_list(*list, p2);
+ 		      _asn1_delete_node_from_list (*list, p2);
  		      _asn1_remove_node (p2, 0);
 diff --git a/lib/structure.c b/lib/structure.c
-index 8189c56..6dfba58 100644
+index 512dd60..13f02ba 100644
 --- a/lib/structure.c
 +++ b/lib/structure.c
 @@ -207,13 +207,13 @@ asn1_array2tree (const asn1_static_node * array, asn1_node * definitions,
@@ -31,18 +31,18 @@
  	{
 -	  if (p_last && p_last->down)
 +	  while (p_last && p_last->down)
- 	      _asn1_delete_structure (e_list, &p_last->down, 0);
+ 	    _asn1_delete_structure (e_list, &p_last->down, 0);
  	  _asn1_set_down (p_last, p);
  	}
        else if (move == RIGHT)
-         {
+ 	{
 -	  if (p_last && p_last->right)
 +	  while (p_last && p_last->right)
- 	      _asn1_delete_structure (e_list, &p_last->right, 0);
+ 	    _asn1_delete_structure (e_list, &p_last->right, 0);
  	  _asn1_set_right (p_last, p);
-         }
-@@ -317,7 +317,7 @@ int
- _asn1_delete_structure (list_type *e_list, asn1_node * structure, unsigned int flags)
+ 	}
+@@ -318,7 +318,7 @@ _asn1_delete_structure (list_type * e_list, asn1_node * structure,
+ 			unsigned int flags)
  {
    asn1_node p, p2, p3;
 -
@@ -50,28 +50,28 @@
    if (*structure == NULL)
      return ASN1_ELEMENT_NOT_FOUND;
  
-@@ -347,7 +347,11 @@ _asn1_delete_structure (list_type *e_list, asn1_node * structure, unsigned int f
+@@ -348,7 +348,11 @@ _asn1_delete_structure (list_type * e_list, asn1_node * structure,
  		{
  		  p3 = _asn1_find_up (p);
  		  if (p3)
-+                 {
++		  {
  		    _asn1_set_down (p3, p2);
-+                   p2 = NULL;
-+                   flag_t = 0;
-+                 }
++		    p2 = NULL;
++		    flag_t = 0;
++		  }
  		  else
  		    {
  		      if (p->right)
-@@ -355,15 +359,19 @@ _asn1_delete_structure (list_type *e_list, asn1_node * structure, unsigned int f
+@@ -356,15 +360,19 @@ _asn1_delete_structure (list_type * e_list, asn1_node * structure,
  		    }
  		}
  	      else
 -		_asn1_set_right (p3, p2);
-+               {
-+                 _asn1_set_right (p3,p2);
-+                 p2 = NULL;
-+                 flag_t = 0;
-+               }
++		{
++		  _asn1_set_right (p3,p2);
++		  p2 = NULL;
++		  flag_t = 0;
++		}
  	      if (e_list)
  		_asn1_delete_node_from_list (e_list, p);
  	      _asn1_remove_node (p, flags);
@@ -86,5 +86,5 @@
    return ASN1_SUCCESS;
  }
 -- 
-1.8.3.1
+2.27.0

_service:tar_scm:libtasn1-4.17.0.tar.gz.sig Deleted

_service:tar_scm:libtasn1-4.17.0.tar.gz -> _service:tar_scm:libtasn1-4.19.0.tar.gz Changed

_service:tar_scm:libtasn1-4.19.0.tar.gz.sig Added

Changes of Revision 8