aboutsummaryrefslogtreecommitdiff
path: root/openssl/trunk/crypto/x509v3/v3_addr.c
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2006-11-13 22:35:59 +0000
committerRob Austein <sra@hactrn.net>2006-11-13 22:35:59 +0000
commit7e3f98eaf9e872337685b767bd683062f3b1d0dc (patch)
treef1327d6c05362c517d1e66a73dc37add6e1e5b42 /openssl/trunk/crypto/x509v3/v3_addr.c
parentdf450e2187209d857d16e6e5506fad7e3faf929e (diff)
Back port tweaks to silence compiler warnings.
svn path=/openssl/trunk/crypto/x509v3/v3_addr.c; revision=464
Diffstat (limited to 'openssl/trunk/crypto/x509v3/v3_addr.c')
-rw-r--r--openssl/trunk/crypto/x509v3/v3_addr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/openssl/trunk/crypto/x509v3/v3_addr.c b/openssl/trunk/crypto/x509v3/v3_addr.c
index 4df042db..8ba22548 100644
--- a/openssl/trunk/crypto/x509v3/v3_addr.c
+++ b/openssl/trunk/crypto/x509v3/v3_addr.c
@@ -312,7 +312,7 @@ static int IPAddressOrRange_cmp(const IPAddressOrRange *a,
const int length)
{
unsigned char addr_a[ADDR_RAW_BUF_LEN], addr_b[ADDR_RAW_BUF_LEN];
- int prefixlen_a, prefixlen_b;
+ int prefixlen_a = 0, prefixlen_b = 0;
int r;
switch (a->type) {
@@ -1172,6 +1172,7 @@ static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx,
*/
if (ext != NULL) {
i = -1;
+ x = NULL;
} else {
i = 0;
x = sk_X509_value(chain, i);
@@ -1234,6 +1235,7 @@ static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx,
/*
* Trust anchor can't inherit.
*/
+ assert(x != NULL);
if (x->rfc3779_addr != NULL) {
for (j = 0; j < sk_IPAddressFamily_num(x->rfc3779_addr); j++) {
IPAddressFamily *fp = sk_IPAddressFamily_value(x->rfc3779_addr, j);