diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2020-03-11 21:49:33 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-12 22:49:28 +0000 |
commit | d24dd531e2fa261b07d98b15d07652048dcb5e8d (patch) | |
tree | 854a54e2140800e98f5566657ee63b051489bece | |
parent | b10131ea746efe6b7056dc670ac9839c17cba578 (diff) | |
download | poky-d24dd531e2fa261b07d98b15d07652048dcb5e8d.tar.gz |
babeltrace2: initialize the other_entry pointer
When add below line to local.conf to enable debug build:
DEBUG_BUILD = "1"
There comes below failure when run "bitbake babeltrace2"
| ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted':
| ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized]
| 702 | !ds_index_entries_equal(entry, other_entry)) {
So initialize the other_entry pointer to fix the above error.
(From OE-Core rev: 1b98db372a1fdaecf9bb897b0ee4b2e72af22f81)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch | 33 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch new file mode 100644 index 0000000000..b56b3bd6e0 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 42dae692b9057d03ce9a0651f061472e9dd90130 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Wed, 11 Mar 2020 08:44:42 +0000 | ||
4 | Subject: [PATCH] fs.c: initialize the other_entry variable | ||
5 | |||
6 | Initialize the pointer other_entry to fix the below error: | ||
7 | | ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted': | ||
8 | | ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized] | ||
9 | | 702 | !ds_index_entries_equal(entry, other_entry)) { | ||
10 | |||
11 | Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2020-March/029549.html] | ||
12 | |||
13 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
14 | --- | ||
15 | src/plugins/ctf/fs-src/fs.c | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c | ||
19 | index e87523a3..a6b5315f 100644 | ||
20 | --- a/src/plugins/ctf/fs-src/fs.c | ||
21 | +++ b/src/plugins/ctf/fs-src/fs.c | ||
22 | @@ -680,7 +680,7 @@ void ds_index_insert_ds_index_entry_sorted( | ||
23 | struct ctf_fs_ds_index_entry *entry) | ||
24 | { | ||
25 | guint i; | ||
26 | - struct ctf_fs_ds_index_entry *other_entry; | ||
27 | + struct ctf_fs_ds_index_entry *other_entry = NULL; | ||
28 | |||
29 | /* Find the spot where to insert this index entry. */ | ||
30 | for (i = 0; i < index->entries->len; i++) { | ||
31 | -- | ||
32 | 2.24.1 | ||
33 | |||
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb index 61bc7f5e6b..e71ac1ad57 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | |||
@@ -11,6 +11,7 @@ SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 | |||
11 | file://run-ptest \ | 11 | file://run-ptest \ |
12 | file://0001-tests-do-not-run-test-applications-from-.libs.patch \ | 12 | file://0001-tests-do-not-run-test-applications-from-.libs.patch \ |
13 | file://0001-Make-manpages-multilib-identical.patch \ | 13 | file://0001-Make-manpages-multilib-identical.patch \ |
14 | file://0001-fs.c-initialize-other_entry.patch \ | ||
14 | " | 15 | " |
15 | SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" | 16 | SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" |
16 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" | 17 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" |