Commit d3aabf4d authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Fix various small leaks on error cases 

Spotted by coverity, bug 7816, bugfix on various versions.
parent b509ead2

changes/bug7816_023_small

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Fix various places where we leak file descriptors or memory on

      error cases. Spotted by coverity. Fixes parts of bug 7816.

src/common/log.c

+3 −1
Original line number Diff line number Diff line
@@ -833,8 +833,10 @@ add_file_log(const log_severity_list_t *severity, const char *filename) 
  fd = tor_open_cloexec(filename, O_WRONLY|O_CREAT|O_APPEND, 0644);

  if (fd<0)

    return -1;

  if (tor_fd_seekend(fd)<0)

  if (tor_fd_seekend(fd)<0) {

    close(fd);

    return -1;

  }



  LOCK_LOGS();

  add_stream_log_impl(severity, filename, fd);

src/common/util.c

+3 −1
Original line number Diff line number Diff line
@@ -2305,8 +2305,10 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out) 
    return NULL;

  }



  if ((uint64_t)(statbuf.st_size)+1 >= SIZE_T_CEILING)

  if ((uint64_t)(statbuf.st_size)+1 >= SIZE_T_CEILING) {

    close(fd);

    return NULL;

  }



  string = tor_malloc((size_t)(statbuf.st_size+1));

src/or/connection.c

+3 −0
Original line number Diff line number Diff line
@@ -992,6 +992,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, 
    if (bind(s, listensockaddr, (socklen_t)sizeof(struct sockaddr_un)) == -1) {

      log_warn(LD_NET,"Bind to %s failed: %s.", address,

               tor_socket_strerror(tor_socket_errno(s)));

      tor_close_socket(s);

      goto err;

    }

#ifdef HAVE_PWD_H
@@ -1000,9 +1001,11 @@ connection_listener_new(const struct sockaddr *listensockaddr, 
      if (pw == NULL) {

        log_warn(LD_NET,"Unable to chown() %s socket: user %s not found.",

                 address, options->User);

        tor_close_socket(s);

      } else if (chown(address, pw->pw_uid, pw->pw_gid) < 0) {

        log_warn(LD_NET,"Unable to chown() %s socket: %s.",

                 address, strerror(errno));

        tor_close_socket(s);

        goto err;

      }

    }

src/or/geoip.c

+4 −1
Original line number Diff line number Diff line
@@ -1316,8 +1316,11 @@ load_bridge_stats(time_t now) 


  fname = get_datadir_fname2("stats", "bridge-stats");

  contents = read_file_to_str(fname, RFTS_IGNORE_MISSING, NULL);

  if (contents && validate_bridge_stats(contents, now))

  if (contents && validate_bridge_stats(contents, now)) {

    bridge_stats_extrainfo = contents;

  } else {

    tor_free(contents);

  }



  tor_free(fname);

}