summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/objects')
-rw-r--r--src/lib/libcrypto/objects/obj_dat.c9
-rw-r--r--src/lib/libcrypto/objects/obj_lib.c12
2 files changed, 7 insertions, 14 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c
index e31940da45..a71959222f 100644
--- a/src/lib/libcrypto/objects/obj_dat.c
+++ b/src/lib/libcrypto/objects/obj_dat.c
@@ -294,8 +294,7 @@ OBJ_add_object(const ASN1_OBJECT *obj)
294 ao[i]->obj = o; 294 ao[i]->obj = o;
295 aop = lh_ADDED_OBJ_insert(added, ao[i]); 295 aop = lh_ADDED_OBJ_insert(added, ao[i]);
296 /* memory leak, buit should not normally matter */ 296 /* memory leak, buit should not normally matter */
297 if (aop != NULL) 297 free(aop);
298 free(aop);
299 } 298 }
300 } 299 }
301 o->flags &= ~(ASN1_OBJECT_FLAG_DYNAMIC | 300 o->flags &= ~(ASN1_OBJECT_FLAG_DYNAMIC |
@@ -308,10 +307,8 @@ err2:
308 OBJerr(OBJ_F_OBJ_ADD_OBJECT, ERR_R_MALLOC_FAILURE); 307 OBJerr(OBJ_F_OBJ_ADD_OBJECT, ERR_R_MALLOC_FAILURE);
309err: 308err:
310 for (i = ADDED_DATA; i <= ADDED_NID; i++) 309 for (i = ADDED_DATA; i <= ADDED_NID; i++)
311 if (ao[i] != NULL) 310 free(ao[i]);
312 free(ao[i]); 311 free(o);
313 if (o != NULL)
314 free(o);
315 return (NID_undef); 312 return (NID_undef);
316} 313}
317 314
diff --git a/src/lib/libcrypto/objects/obj_lib.c b/src/lib/libcrypto/objects/obj_lib.c
index 57f0b28cc0..25bc8fb5ee 100644
--- a/src/lib/libcrypto/objects/obj_lib.c
+++ b/src/lib/libcrypto/objects/obj_lib.c
@@ -114,14 +114,10 @@ OBJ_dup(const ASN1_OBJECT *o)
114 114
115err: 115err:
116 OBJerr(OBJ_F_OBJ_DUP, ERR_R_MALLOC_FAILURE); 116 OBJerr(OBJ_F_OBJ_DUP, ERR_R_MALLOC_FAILURE);
117 if (ln != NULL) 117 free(ln);
118 free(ln); 118 free(sn);
119 if (sn != NULL) 119 free(data);
120 free(sn); 120 free(r);
121 if (data != NULL)
122 free(data);
123 if (r != NULL)
124 free(r);
125 return (NULL); 121 return (NULL);
126} 122}
127 123