Fix some missing inits
(Imported from upstream's f792c663048f19347a1bb72125e535e4fb2ecf39.) Change-Id: If9bbb10de3ea858076bd9587d21ec331e837dd53 Reviewed-on: https://boringssl-review.googlesource.com/8171 Reviewed-by: Steven Valdez <svaldez@google.com> Reviewed-by: David Benjamin <davidben@google.com>
This commit is contained in:
parent
26b7c35d8c
commit
0a45822afe
@ -247,6 +247,7 @@ int ASN1_STRING_TABLE_add(int nid,
|
|||||||
}
|
}
|
||||||
tmp->flags = flags | STABLE_FLAGS_MALLOC;
|
tmp->flags = flags | STABLE_FLAGS_MALLOC;
|
||||||
tmp->nid = nid;
|
tmp->nid = nid;
|
||||||
|
tmp->minsize = tmp->maxsize = -1;
|
||||||
new_nid = 1;
|
new_nid = 1;
|
||||||
} else
|
} else
|
||||||
tmp->flags = (tmp->flags & STABLE_FLAGS_MALLOC) | flags;
|
tmp->flags = (tmp->flags & STABLE_FLAGS_MALLOC) | flags;
|
||||||
|
@ -165,10 +165,12 @@ static int asn1_bio_init(BIO_ASN1_BUF_CTX *ctx, int size)
|
|||||||
ctx->copylen = 0;
|
ctx->copylen = 0;
|
||||||
ctx->asn1_class = V_ASN1_UNIVERSAL;
|
ctx->asn1_class = V_ASN1_UNIVERSAL;
|
||||||
ctx->asn1_tag = V_ASN1_OCTET_STRING;
|
ctx->asn1_tag = V_ASN1_OCTET_STRING;
|
||||||
ctx->ex_buf = 0;
|
ctx->ex_buf = NULL;
|
||||||
ctx->ex_pos = 0;
|
|
||||||
ctx->ex_len = 0;
|
ctx->ex_len = 0;
|
||||||
|
ctx->ex_pos = 0;
|
||||||
ctx->state = ASN1_STATE_START;
|
ctx->state = ASN1_STATE_START;
|
||||||
|
ctx->prefix = ctx->prefix_free = ctx->suffix = ctx->suffix_free = NULL;
|
||||||
|
ctx->ex_arg = NULL;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -139,6 +139,7 @@ BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it)
|
|||||||
ndef_aux->ndef_bio = sarg.ndef_bio;
|
ndef_aux->ndef_bio = sarg.ndef_bio;
|
||||||
ndef_aux->boundary = sarg.boundary;
|
ndef_aux->boundary = sarg.boundary;
|
||||||
ndef_aux->out = out;
|
ndef_aux->out = out;
|
||||||
|
ndef_aux->derbuf = NULL;
|
||||||
|
|
||||||
BIO_ctrl(asn_bio, BIO_C_SET_EX_ARG, 0, ndef_aux);
|
BIO_ctrl(asn_bio, BIO_C_SET_EX_ARG, 0, ndef_aux);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user