Commit 51ca375e authored by Ulf Möller's avatar Ulf Möller
Browse files

Seek out and destroy another evil cast.

parent 1749d8a0

apps/s_server.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int ebcdic_write(BIO *b, char *in, int inl) 
		num = num + num;  /* double the size */

		if (num < inl)

			num = inl;

		Free((char*)wbuf);

		Free(wbuf);

		wbuf=(EBCDIC_OUTBUFF *)Malloc(sizeof(EBCDIC_OUTBUFF) + num);



		wbuf->alloced = num;

crypto/asn1/a_bitstr.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, unsigned char **pp, 
		s=NULL;



	ret->length=(int)len;

	if (ret->data != NULL) Free((char *)ret->data);

	if (ret->data != NULL) Free(ret->data);

	ret->data=s;

	ret->type=V_ASN1_BIT_STRING;

	if (a != NULL) (*a)=ret;

crypto/asn1/a_bytes.c

+3 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, unsigned char **pp, 
	else

		s=NULL;



	if (ret->data != NULL) Free((char *)ret->data);

	if (ret->data != NULL) Free(ret->data);

	ret->length=(int)len;

	ret->data=s;

	ret->type=tag;
@@ -218,7 +218,7 @@ ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, unsigned char **pp, long length, 
			{

			if ((ret->length < len) || (ret->data == NULL))

				{

				if (ret->data != NULL) Free((char *)ret->data);

				if (ret->data != NULL) Free(ret->data);

				s=(unsigned char *)Malloc((int)len + 1);

				if (s == NULL)

					{
@@ -235,7 +235,7 @@ ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, unsigned char **pp, long length, 
		else

			{

			s=NULL;

			if (ret->data != NULL) Free((char *)ret->data);

			if (ret->data != NULL) Free(ret->data);

			}



		ret->length=(int)len;

crypto/asn1/a_dup.c

+1 −1
Original line number Diff line number Diff line
@@ -78,6 +78,6 @@ char *ASN1_dup(int (*i2d)(), char *(*d2i)(), char *x) 
	i=i2d(x,&p);

	p= b;

	ret=d2i(NULL,&p,i);

	Free((char *)b);

	Free(b);

	return(ret);

	}

crypto/asn1/a_enum.c

+2 −2
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ ASN1_ENUMERATED *d2i_ASN1_ENUMERATED(ASN1_ENUMERATED **a, unsigned char **pp, 
		p+=len;

	}



	if (ret->data != NULL) Free((char *)ret->data);

	if (ret->data != NULL) Free(ret->data);

	ret->data=s;

	ret->length=(int)len;

	if (a != NULL) (*a)=ret;
@@ -242,7 +242,7 @@ int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v) 
	if (a->length < (sizeof(long)+1))

		{

		if (a->data != NULL)

			Free((char *)a->data);

			Free(a->data);

		if ((a->data=(unsigned char *)Malloc(sizeof(long)+1)) != NULL)

			memset((char *)a->data,0,sizeof(long)+1);

		}