[gq-commit] gq/src dt_cert.c,1.6,1.7

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24371

Modified Files:
	dt_cert.c 
Log Message:
* Fixed a bug wrt PKCS12 reading - in case of an error in the PKCS12
  file gq crashed duw to a missing NULL check.


Index: dt_cert.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_cert.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dt_cert.c	12 Jul 2002 22:29:02 -0000	1.6
--- dt_cert.c	28 Sep 2003 23:16:54 -0000	1.7
***************
*** 128,132 ****
  		    /* try PKCS12 - but without a password this is not
                         really useful.... hmmmm*/
! 		    PKCS12 *p12;
  
  		    BIO_reset(databio);
--- 128,132 ----
  		    /* try PKCS12 - but without a password this is not
                         really useful.... hmmmm*/
! 		    PKCS12 *p12 = NULL;
  
  		    BIO_reset(databio);
***************
*** 135,140 ****
  		    p12 = d2i_PKCS12_bio(databio, NULL);
  		    
! 		    PKCS12_parse(p12, NULL, NULL, &x, NULL);
! 		    PKCS12_free(p12);
  
  		    if (x) {
--- 135,142 ----
  		    p12 = d2i_PKCS12_bio(databio, NULL);
  		    
! 		    if (p12) {
! 			 PKCS12_parse(p12, NULL, NULL, &x, NULL);
! 			 PKCS12_free(p12);
! 		    }
  
  		    if (x) {