summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/txt_db/txt_db.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/txt_db/txt_db.c')
-rw-r--r--src/lib/libcrypto/txt_db/txt_db.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/lib/libcrypto/txt_db/txt_db.c b/src/lib/libcrypto/txt_db/txt_db.c
index e29a60316a..3f7fea6d2a 100644
--- a/src/lib/libcrypto/txt_db/txt_db.c
+++ b/src/lib/libcrypto/txt_db/txt_db.c
@@ -178,12 +178,9 @@ err:
178 if (ret != NULL) { 178 if (ret != NULL) {
179 if (ret->data != NULL) 179 if (ret->data != NULL)
180 sk_OPENSSL_PSTRING_free(ret->data); 180 sk_OPENSSL_PSTRING_free(ret->data);
181 if (ret->index != NULL) 181 free(ret->index);
182 free(ret->index); 182 free(ret->qual);
183 if (ret->qual != NULL) 183 free(ret);
184 free(ret->qual);
185 if (ret != NULL)
186 free(ret);
187 } 184 }
188 return (NULL); 185 return (NULL);
189 } else 186 } else
@@ -350,8 +347,7 @@ TXT_DB_free(TXT_DB *db)
350 lh_OPENSSL_STRING_free(db->index[i]); 347 lh_OPENSSL_STRING_free(db->index[i]);
351 free(db->index); 348 free(db->index);
352 } 349 }
353 if (db->qual != NULL) 350 free(db->qual);
354 free(db->qual);
355 if (db->data != NULL) { 351 if (db->data != NULL) {
356 for (i = sk_OPENSSL_PSTRING_num(db->data) - 1; i >= 0; i--) { 352 for (i = sk_OPENSSL_PSTRING_num(db->data) - 1; i >= 0; i--) {
357 /* check if any 'fields' have been allocated 353 /* check if any 'fields' have been allocated
@@ -361,8 +357,7 @@ TXT_DB_free(TXT_DB *db)
361 if (max == NULL) /* new row */ 357 if (max == NULL) /* new row */
362 { 358 {
363 for (n = 0; n < db->num_fields; n++) 359 for (n = 0; n < db->num_fields; n++)
364 if (p[n] != NULL) 360 free(p[n]);
365 free(p[n]);
366 } else { 361 } else {
367 for (n = 0; n < db->num_fields; n++) { 362 for (n = 0; n < db->num_fields; n++) {
368 if (((p[n] < (char *)p) || 363 if (((p[n] < (char *)p) ||