/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2018-01-29 19:21:23 UTC
  • Revision ID: teddy@recompile.se-20180129192123-y6brq6tnnnxm2oi2
http://bugs.debian.org/886595
Fix memory leak in plugin-runner (this fixes Debian bug #886595)

* plugin-runner.c (free_plugin): Bug fix: Also free() plugin name.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
9
9
 * "browse_callback", and parts of "main".
10
10
 * 
11
11
 * Everything else is
12
 
 * Copyright © 2008-2018 Teddy Hogeborn
13
 
 * Copyright © 2008-2018 Björn Påhlsson
 
12
 * Copyright © 2008-2017 Teddy Hogeborn
 
13
 * Copyright © 2008-2017 Björn Påhlsson
14
14
 * 
15
15
 * This file is part of Mandos.
16
16
 * 
1923
1923
      return;
1924
1924
    }
1925
1925
  }
1926
 
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
1927
 
  if(devnull == -1){
1928
 
    perror_plus("open(\"/dev/null\", O_RDONLY)");
1929
 
    return;
1930
 
  }
1931
1926
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1932
1927
                           runnable_hook, alphasort);
1933
1928
  if(numhooks == -1){
1934
1929
    perror_plus("scandir");
1935
 
    close(devnull);
1936
1930
    return;
1937
1931
  }
1938
1932
  struct dirent *direntry;
1939
1933
  int ret;
 
1934
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
 
1935
  if(devnull == -1){
 
1936
    perror_plus("open(\"/dev/null\", O_RDONLY)");
 
1937
    return;
 
1938
  }
1940
1939
  for(int i = 0; i < numhooks; i++){
1941
1940
    direntry = direntries[i];
1942
1941
    if(debug){
3084
3083
            clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3085
3084
            dret = 0;
3086
3085
          }
3087
 
          if((dret == -1) and (errno != ENOENT)){
 
3086
          if(dret == -1){
3088
3087
            fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3089
3088
                         direntries[i]->d_name, strerror(errno));
3090
3089
          }