backport recent changes from the cvs head

This commit is contained in:
Nils Larsch
2006-02-08 19:16:33 +00:00
parent 9f85fcefdc
commit 22d1087e16
19 changed files with 98 additions and 44 deletions

View File

@@ -82,7 +82,8 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
r->data=OPENSSL_malloc(o->length);
if (r->data == NULL)
goto err;
memcpy(r->data,o->data,o->length);
if (o->data != NULL)
memcpy(r->data,o->data,o->length);
r->length=o->length;
r->nid=o->nid;
r->ln=r->sn=NULL;