Update from head.
This commit is contained in:
parent
87b857b6bf
commit
fdb0a6e004
@ -326,11 +326,13 @@ int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
|
|||||||
{
|
{
|
||||||
ASN1_TYPE *typ;
|
ASN1_TYPE *typ;
|
||||||
int utype;
|
int utype;
|
||||||
const ASN1_PRIMITIVE_FUNCS *pf;
|
|
||||||
pf = it->funcs;
|
|
||||||
|
|
||||||
if (pf && pf->prim_new)
|
if (it && it->funcs)
|
||||||
|
{
|
||||||
|
const ASN1_PRIMITIVE_FUNCS *pf = it->funcs;
|
||||||
|
if (pf->prim_new)
|
||||||
return pf->prim_new(pval, it);
|
return pf->prim_new(pval, it);
|
||||||
|
}
|
||||||
|
|
||||||
if (!it || (it->itype == ASN1_ITYPE_MSTRING))
|
if (!it || (it->itype == ASN1_ITYPE_MSTRING))
|
||||||
utype = -1;
|
utype = -1;
|
||||||
@ -374,10 +376,9 @@ int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
|
|||||||
void asn1_primitive_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
|
void asn1_primitive_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
|
||||||
{
|
{
|
||||||
int utype;
|
int utype;
|
||||||
const ASN1_PRIMITIVE_FUNCS *pf;
|
if (it && it->funcs)
|
||||||
pf = it->funcs;
|
|
||||||
if (pf)
|
|
||||||
{
|
{
|
||||||
|
const ASN1_PRIMITIVE_FUNCS *pf = it->funcs;
|
||||||
if (pf->prim_clear)
|
if (pf->prim_clear)
|
||||||
pf->prim_clear(pval, it);
|
pf->prim_clear(pval, it);
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user