diff options
Diffstat (limited to 'meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch')
-rw-r--r-- | meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch b/meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch deleted file mode 100644 index 0774ad946a..0000000000 --- a/meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From ce64633b9733e962b8d8482244301f614d8b5845 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 22 Aug 2016 22:54:24 -0700 | ||
4 | Subject: [PATCH] Check for malloc_trim before using it | ||
5 | |||
6 | malloc_trim is gnu specific and not all libc | ||
7 | implement it, threfore write a configure check | ||
8 | to poke for it first and use the define to | ||
9 | guard its use. | ||
10 | |||
11 | Helps in compiling on musl based systems | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | Upstream-Status: Submitted [https://github.com/ikeydoherty/cve-check-tool/pull/48] | ||
16 | configure.ac | 2 ++ | ||
17 | src/core.c | 4 ++-- | ||
18 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index d3b66ce..79c3542 100644 | ||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -19,6 +19,8 @@ m4_define([json_required_version], [0.16.0]) | ||
25 | m4_define([openssl_required_version],[1.0.0]) | ||
26 | # TODO: Set minimum sqlite | ||
27 | |||
28 | +AC_CHECK_FUNCS_ONCE(malloc_trim) | ||
29 | + | ||
30 | PKG_CHECK_MODULES(CVE_CHECK_TOOL, | ||
31 | [ | ||
32 | glib-2.0 >= glib_required_version, | ||
33 | diff --git a/src/core.c b/src/core.c | ||
34 | index 6263031..0d5df29 100644 | ||
35 | --- a/src/core.c | ||
36 | +++ b/src/core.c | ||
37 | @@ -498,9 +498,9 @@ bool cve_db_load(CveDB *self, const char *fname) | ||
38 | } | ||
39 | |||
40 | b = true; | ||
41 | - | ||
42 | +#ifdef HAVE_MALLOC_TRIM | ||
43 | malloc_trim(0); | ||
44 | - | ||
45 | +#endif | ||
46 | xmlFreeTextReader(r); | ||
47 | if (fd) { | ||
48 | close(fd); | ||
49 | -- | ||
50 | 2.9.3 | ||
51 | |||