summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-06 19:10:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-07 08:52:55 +0100
commite1e0c06b5d6e421b8fb4245b4710cd36f08802eb (patch)
tree71d4f186428ab9d4a184d7d9c59e2a8e6b13c7c3 /meta/recipes-devtools
parentc1d72abe5eadd0065303d7d515a429ef1cd1832b (diff)
downloadpoky-e1e0c06b5d6e421b8fb4245b4710cd36f08802eb.tar.gz
rpm: Fix patch to ensure variables aren't used uninitialised
Recent patches were applied which removed a function which set the xx variable. This means xx can be uninitalised and prerm functions can fail. This adjusts the patch to ensure the xx value isn't used in such a way. (From OE-Core rev: 23f15c63777020f5d43b070a1eb2bcf246c19ff8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch16
1 files changed, 13 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch
index a38675f89c..bf24d43eb9 100644
--- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch
+++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch
@@ -6,6 +6,9 @@ Subject: [PATCH 1/2] Do not reset the PATH environment variable before running
6 6
7We add lots of native stuff into it and scriptlets rely on that. 7We add lots of native stuff into it and scriptlets rely on that.
8 8
9Also need to remove the xx test later in the function since the
10value could now be used un-initialised.
11
9Upstream-Status: Inappropriate [oe-core specific] 12Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11--- 14---
@@ -25,6 +28,13 @@ index 92f949fa2..7c1aa75a8 100644
25 free(ipath); 28 free(ipath);
26 } 29 }
27 30
28-- 31@@ -206,9 +206,7 @@ static void doScriptExec(ARGV_const_t ar
292.11.0 32 /* XXX Don't mtrace into children. */
30 33 unsetenv("MALLOC_CHECK_");
34
35- if (xx == 0) {
36 xx = execv(argv[0], argv);
37- }
38 }
39 _exit(127); /* exit 127 for compatibility with bash(1) */
40 }