Commit f763e0b5 authored by Nils Larsch's avatar Nils Larsch
Browse files

make sure error queue is totally emptied 

PR: 359
parent eb3eab20

crypto/asn1/a_d2i_fp.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb) 
			if (e != ASN1_R_TOO_LONG)

				goto err;

			else

				ERR_get_error(); /* clear error */

				ERR_clear_error(); /* clear error */

			}

		i=c.p-p;/* header length */

		off+=i;	/* end of data */

crypto/conf/conf_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ long CONF_get_number(LHASH *conf,const char *group,const char *name) 
	if (status == 0)

		{

		/* This function does not believe in errors... */

		ERR_get_error();

		ERR_clear_error();

		}

	return result;

	}

crypto/conf/conf_mod.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static CONF_MODULE *module_load_dso(const CONF *cnf, char *name, char *value, 
	path = NCONF_get_string(cnf, value, "path");

	if (!path)

		{

		ERR_get_error();

		ERR_clear_error();

		path = name;

		}

	dso = DSO_load(NULL, path, NULL, 0);

crypto/objects/obj_dat.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name) 
	i=a2d_ASN1_OBJECT(NULL,0,s,-1);

	if (i <= 0) {

		/* Clear the error */

		ERR_get_error();

		ERR_clear_error();

		return NULL;

	}

	/* Work out total size */

crypto/pkcs7/bio_ber.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ int bio_ber_get_header(BIO *bio, BIO_BER_CTX *ctx) 
		if ((ctx->buf_len < BER_BUF_SIZE) &&

			(ERR_GET_REASON(ERR_peek_error()) == ASN1_R_TOO_LONG))

			{

			ERR_get_error(); /* clear the error */

			ERR_clear_error(); /* clear the error */

			BIO_set_retry_read(b);

			}

		return(-1);