Changeset c2969f9

Timestamp:

2015-10-08T04:58:59Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

df215a3

Parents:

3cbf71d

git-author:

dequis <dx@…> (16-09-15 06:36:48)

git-committer:

dequis <dx@…> (08-10-15 04:58:59)

Message:

conf, help: Fix minor leaks in error conditions

From coverity.

Files:

• conf.c (modified) (3 diffs)
• help.c (modified) (1 diff)

conf.c

@@ -74 +74 @@
         if (i == 0) {
                 fprintf(stderr, "Error: Syntax error in configuration file `%s'.\n", global.conf_file);
+                conf_free(conf);
                 return NULL;
         } else if (i == -1) {
@@ -136 +137 @@
                                "  -h  Show this help page.\n"
                                "  -V  Show version info.\n");
+                        conf_free(conf);
                         return NULL;
                 } else if (opt == 'V') {
                         printf("BitlBee %s\nAPI version %06x\n",
                                BITLBEE_VERSION, BITLBEE_VERSION_CODE);
+                        conf_free(conf);
                         return NULL;
                 } else if (opt == 'u') {
@@ -163 +166 @@
                    they're secure when in fact they're not. */
                 fprintf(stderr, "Error: Could not read CA file %s: %s\n", conf->cafile, strerror(errno));
+                conf_free(conf);
                 return NULL;
         }

help.c

@@ -146 +146 @@
                         if (lseek(h->fd, h->offset.file_offset, SEEK_SET) == -1 ||
                             read(h->fd, s, h->length) != h->length) {
+                                g_free(s);
                                 return NULL;
                         }