From 6d98406d7128a1e42a19e1b55fed3ec1e7a0b0a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Thu, 29 Dec 2011 07:35:27 +0100 Subject: [PATCH] Fixed #3444 (False positive using putenv) --- lib/checkmemoryleak.cpp | 2 +- test/testmemleak.cpp | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp index 31e1c01a1..f92ac094e 100644 --- a/lib/checkmemoryleak.cpp +++ b/lib/checkmemoryleak.cpp @@ -61,7 +61,7 @@ static const char * const call_func_white_list[] = { , "mkdir", "mkfifo", "mknod", "mkstemp" , "obstack_printf", "obstack_vprintf", "open", "opendir", "parse_printf_format", "pathconf" , "perror", "popen" ,"posix_fadvise", "posix_fallocate", "pread" - , "printf", "psignal", "putenv", "puts", "pwrite", "qsort", "read", "readahead", "readdir", "readdir_r" + , "printf", "psignal", "puts", "pwrite", "qsort", "read", "readahead", "readdir", "readdir_r" , "readlink", "readv" , "realloc", "regcomp", "remove", "rename", "return", "rewind", "rewinddir", "rindex" , "rmdir" ,"scandir", "scanf", "seekdir" diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp index b39a8d7c5..14e31c84b 100644 --- a/test/testmemleak.cpp +++ b/test/testmemleak.cpp @@ -222,6 +222,7 @@ private: TEST_CASE(func23); // Ticket #2667 TEST_CASE(func24); // Ticket #2705 TEST_CASE(func25); // Ticket #2904 + TEST_CASE(func26); TEST_CASE(allocfunc1); TEST_CASE(allocfunc2); @@ -589,7 +590,7 @@ private: , "getgrnam", "gethostbyaddr", "getnetbyname", "getopt", "getopt_long", "getprotobyname", "getpwnam" , "getservbyname", "getservbyport", "glob", "index", "inet_addr", "inet_aton", "inet_network" , "initgroups", "link", "mblen", "mbstowcs", "mbtowc", "mkdir", "mkfifo", "mknod", "obstack_printf" - , "obstack_vprintf", "opendir", "parse_printf_format", "pathconf", "popen", "psignal", "putenv" + , "obstack_vprintf", "opendir", "parse_printf_format", "pathconf", "popen", "psignal" , "readlink", "regcomp", "strxfrm", "wordexp", "sizeof", "strtok" }; @@ -2221,6 +2222,14 @@ private: ASSERT_EQUALS("[test.cpp:5]: (error) Memory leak: f\n", errout.str()); } + void func26() { // ticket #3444 + // technically there is a leak here. however warning is not wanted + check("void f() {\n" + " char *p = strdup(\"A=B\");\n" + " putenv(p);\n" + "}"); + ASSERT_EQUALS("", errout.str()); + } void allocfunc1() { check("static char *a()\n"