generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle case where v6stat.zero_pos == 0 correctly.

Browse Source 
Reported by: Kurt Roeckx <kurt@roeckx.be>, Tobias Ginzler <ginzler@fgan.de> (Debian bug #506111)
This commit is contained in:
Dr. Stephen Henson 2008-12-07 23:58:44 +00:00
parent ae381fef5c
commit 1d4e879106
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/x509v3/v3_utl.c
View File

@ -739,17 +739,20 @@ static int ipv6_from_asc(unsigned char *v6, const char *in)
/* Format result */ /* Format result */
/* Copy initial part */
if (v6stat.zero_pos > 0) if (v6stat.zero_pos > 0)
{
/* Copy initial part */
memcpy(v6, v6stat.tmp, v6stat.zero_pos); memcpy(v6, v6stat.tmp, v6stat.zero_pos);
/* Zero middle */ /* Zero middle */
if (v6stat.total != 16)
memset(v6 + v6stat.zero_pos, 0, 16 - v6stat.total); memset(v6 + v6stat.zero_pos, 0, 16 - v6stat.total);
/* Copy final part */ /* Copy final part */
if (v6stat.total != v6stat.zero_pos) if (v6stat.total != v6stat.zero_pos)
memcpy(v6 + v6stat.zero_pos + 16 - v6stat.total, memcpy(v6 + v6stat.zero_pos + 16 - v6stat.total,
v6stat.tmp + v6stat.zero_pos, v6stat.tmp + v6stat.zero_pos,
v6stat.total - v6stat.zero_pos); v6stat.total - v6stat.zero_pos);
}
else
memcpy(v6, v6stat.tmp, 16);
return 1; return 1;
} }