diff options
Diffstat (limited to 'src/lib/libcrypto/conf/conf_def.c')
-rw-r--r-- | src/lib/libcrypto/conf/conf_def.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c index b3c75e1a9e..b550623e57 100644 --- a/src/lib/libcrypto/conf/conf_def.c +++ b/src/lib/libcrypto/conf/conf_def.c | |||
@@ -416,15 +416,13 @@ again: | |||
416 | } | 416 | } |
417 | if (buff != NULL) | 417 | if (buff != NULL) |
418 | BUF_MEM_free(buff); | 418 | BUF_MEM_free(buff); |
419 | if (section != NULL) | 419 | free(section); |
420 | free(section); | ||
421 | return (1); | 420 | return (1); |
422 | 421 | ||
423 | err: | 422 | err: |
424 | if (buff != NULL) | 423 | if (buff != NULL) |
425 | BUF_MEM_free(buff); | 424 | BUF_MEM_free(buff); |
426 | if (section != NULL) | 425 | free(section); |
427 | free(section); | ||
428 | if (line != NULL) | 426 | if (line != NULL) |
429 | *line = eline; | 427 | *line = eline; |
430 | ERR_asprintf_error_data("line %ld", eline); | 428 | ERR_asprintf_error_data("line %ld", eline); |
@@ -433,12 +431,9 @@ err: | |||
433 | conf->data = NULL; | 431 | conf->data = NULL; |
434 | } | 432 | } |
435 | if (v != NULL) { | 433 | if (v != NULL) { |
436 | if (v->name != NULL) | 434 | free(v->name); |
437 | free(v->name); | 435 | free(v->value); |
438 | if (v->value != NULL) | 436 | free(v); |
439 | free(v->value); | ||
440 | if (v != NULL) | ||
441 | free(v); | ||
442 | } | 437 | } |
443 | return (0); | 438 | return (0); |
444 | } | 439 | } |
@@ -615,8 +610,7 @@ str_copy(CONF *conf, char *section, char **pto, char *from) | |||
615 | buf->data[to++] = *(from++); | 610 | buf->data[to++] = *(from++); |
616 | } | 611 | } |
617 | buf->data[to]='\0'; | 612 | buf->data[to]='\0'; |
618 | if (*pto != NULL) | 613 | free(*pto); |
619 | free(*pto); | ||
620 | *pto = buf->data; | 614 | *pto = buf->data; |
621 | free(buf); | 615 | free(buf); |
622 | return (1); | 616 | return (1); |