Commit 792e6141 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix from HEAD.

parent ce2b87d8

crypto/x509v3/v3_utl.c

+11 −8
Original line number Diff line number Diff line
@@ -736,17 +736,20 @@ static int ipv6_from_asc(unsigned char *v6, const char *in) 


	/* Format result */



	/* Copy initial part */

	if (v6stat.zero_pos > 0)

		{

		/* Copy initial part */

		memcpy(v6, v6stat.tmp, v6stat.zero_pos);

		/* Zero middle */

	if (v6stat.total != 16)

		memset(v6 + v6stat.zero_pos, 0, 16 - v6stat.total);

		/* Copy final part */

		if (v6stat.total != v6stat.zero_pos)

			memcpy(v6 + v6stat.zero_pos + 16 - v6stat.total,

				v6stat.tmp + v6stat.zero_pos,

				v6stat.total - v6stat.zero_pos);

		}

	else

		memcpy(v6, v6stat.tmp, 16);



	return 1;

	}