Changeset 3fbce97 for help.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• help.c (modified) (2 diffs)

help.c

@@ -105 +105 @@
         h = *help;
         while (h) {
-                if (h->fd != last_fd) {
+                if (h->fd == -1) {
+                        g_free(h->offset.mem_offset);
+                } else if (h->fd != last_fd) {
                         close(h->fd);
                         last_fd = h->fd;
@@ -146 +148 @@
                         if (lseek(h->fd, h->offset.file_offset, SEEK_SET) == -1 ||
                             read(h->fd, s, h->length) != h->length) {
+                                g_free(s);
                                 return NULL;
                         }