Unverified Commit ca52b7ff by Christian Brauner Committed by GitHub

Merge pull request #3781 from evverx/lxcpath-memleak

tests: fix a memory leak in lxcpath
parents 274615f9 4cd72b69
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "memory_utils.h"
#define MYNAME "lxctest1" #define MYNAME "lxctest1"
#define TSTERR(x) do { \ #define TSTERR(x) do { \
...@@ -36,7 +38,8 @@ ...@@ -36,7 +38,8 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct lxc_container *c; struct lxc_container *c;
const char *p1, *p2; const char *p1;
__do_free char *p2 = NULL;
int retval = -1; int retval = -1;
c = lxc_container_new(MYNAME, NULL); c = lxc_container_new(MYNAME, NULL);
...@@ -60,6 +63,7 @@ int main(int argc, char *argv[]) ...@@ -60,6 +63,7 @@ int main(int argc, char *argv[])
} }
p1 = c->get_config_path(c); p1 = c->get_config_path(c);
free(p2);
p2 = c->config_file_name(c); p2 = c->config_file_name(c);
if (strcmp(p1, CPATH) || strcmp(p2, FPATH)) { if (strcmp(p1, CPATH) || strcmp(p2, FPATH)) {
TSTERR("Bad result for path names after set_config_path()"); TSTERR("Bad result for path names after set_config_path()");
...@@ -74,6 +78,7 @@ int main(int argc, char *argv[]) ...@@ -74,6 +78,7 @@ int main(int argc, char *argv[])
} }
p1 = c->get_config_path(c); p1 = c->get_config_path(c);
free(p2);
p2 = c->config_file_name(c); p2 = c->config_file_name(c);
if (strcmp(p1, CPATH) || strcmp(p2, FPATH)) { if (strcmp(p1, CPATH) || strcmp(p2, FPATH)) {
TSTERR("Bad result for path names after create with custom path"); TSTERR("Bad result for path names after create with custom path");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment