===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/cms.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/openssl/cms.c	2019/11/04 15:18:45	1.10
--- src/usr.bin/openssl/cms.c	2019/11/04 15:31:08	1.11
***************
*** 1,4 ****
! /* $OpenBSD: cms.c,v 1.10 2019/11/04 15:18:45 jsing Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project.
   */
--- 1,4 ----
! /* $OpenBSD: cms.c,v 1.11 2019/11/04 15:31:08 jsing Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project.
   */
***************
*** 939,963 ****
  end:
  	if (ret)
  		ERR_print_errors(bio_err);
  	sk_X509_pop_free(encerts, X509_free);
  	sk_X509_pop_free(other, X509_free);
! 	if (vpm)
! 		X509_VERIFY_PARAM_free(vpm);
! 	if (sksigners)
! 		sk_OPENSSL_STRING_free(sksigners);
! 	if (skkeys)
! 		sk_OPENSSL_STRING_free(skkeys);
  	free(secret_key);
  	free(secret_keyid);
  	free(pwri_tmp);
! 	if (econtent_type)
! 		ASN1_OBJECT_free(econtent_type);
! 	if (rr)
! 		CMS_ReceiptRequest_free(rr);
! 	if (rr_to)
! 		sk_OPENSSL_STRING_free(rr_to);
! 	if (rr_from)
! 		sk_OPENSSL_STRING_free(rr_from);
  	X509_STORE_free(store);
  	X509_free(cert);
  	X509_free(recip);
--- 939,957 ----
  end:
  	if (ret)
  		ERR_print_errors(bio_err);
+ 
  	sk_X509_pop_free(encerts, X509_free);
  	sk_X509_pop_free(other, X509_free);
! 	X509_VERIFY_PARAM_free(vpm);
! 	sk_OPENSSL_STRING_free(sksigners);
! 	sk_OPENSSL_STRING_free(skkeys);
  	free(secret_key);
  	free(secret_keyid);
  	free(pwri_tmp);
! 	ASN1_OBJECT_free(econtent_type);
! 	CMS_ReceiptRequest_free(rr);
! 	sk_OPENSSL_STRING_free(rr_to);
! 	sk_OPENSSL_STRING_free(rr_from);
  	X509_STORE_free(store);
  	X509_free(cert);
  	X509_free(recip);
***************
*** 970,975 ****
--- 964,970 ----
  	BIO_free(indata);
  	BIO_free_all(out);
  	free(passin);
+ 
  	return (ret);
  }
  
***************
*** 1106,1117 ****
  	return ret;
  
  err:
! 	if (ret)
! 		sk_GENERAL_NAMES_pop_free(ret, GENERAL_NAMES_free);
! 	if (gens)
! 		GENERAL_NAMES_free(gens);
! 	if (gen)
! 		GENERAL_NAME_free(gen);
  	return NULL;
  }
  
--- 1101,1110 ----
  	return ret;
  
  err:
! 	sk_GENERAL_NAMES_pop_free(ret, GENERAL_NAMES_free);
! 	GENERAL_NAMES_free(gens);
! 	GENERAL_NAME_free(gen);
! 
  	return NULL;
  }