diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-08-16 00:08:13 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-18 11:44:55 +0100 |
commit | a8fef8bee7212d42b075d200a7901222086fa3c0 (patch) | |
tree | 108cbbc4ff5503c4c7d39b95b10c127f1c631f7c /meta/recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch | |
parent | 2d54561f7462dba931902f0f959ff50de3430950 (diff) | |
download | poky-a8fef8bee7212d42b075d200a7901222086fa3c0.tar.gz |
gcc: Upgrade to 10.2.0
Drop 0036-Enable-CET-in-cross-compiler-if-possible.patch and
pr96130.patch they are already in 10.2
(From OE-Core rev: 35eda14fbdc38ae5e686c2d30a2c1d5569bd3088)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch b/meta/recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch new file mode 100644 index 0000000000..702279af0e --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | From 27b8ba5555ada2dab076988529bfb84d00a4b901 Mon Sep 17 00:00:00 2001 | ||
2 | From: Juro Bystricky <juro.bystricky@intel.com> | ||
3 | Date: Mon, 19 Mar 2018 22:31:20 -0700 | ||
4 | Subject: [PATCH] fix segmentation fault in precompiled header generation | ||
5 | |||
6 | Prevent a segmentation fault which occurs when using incorrect | ||
7 | structure trying to access name of some named operators, such as | ||
8 | CPP_NOT, CPP_AND etc. "token->val.node.spelling" cannot be used in | ||
9 | those cases, as is may not be initialized at all. | ||
10 | |||
11 | [YOCTO #11738] | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | libcpp/lex.c | 26 +++++++++++++++++++++----- | ||
19 | 1 file changed, 21 insertions(+), 5 deletions(-) | ||
20 | |||
21 | diff --git a/libcpp/lex.c b/libcpp/lex.c | ||
22 | index 56ac3a1dd73..73a951148b3 100644 | ||
23 | --- a/libcpp/lex.c | ||
24 | +++ b/libcpp/lex.c | ||
25 | @@ -3311,11 +3311,27 @@ cpp_spell_token (cpp_reader *pfile, const cpp_token *token, | ||
26 | spell_ident: | ||
27 | case SPELL_IDENT: | ||
28 | if (forstring) | ||
29 | - { | ||
30 | - memcpy (buffer, NODE_NAME (token->val.node.spelling), | ||
31 | - NODE_LEN (token->val.node.spelling)); | ||
32 | - buffer += NODE_LEN (token->val.node.spelling); | ||
33 | - } | ||
34 | + { | ||
35 | + if (token->type == CPP_NAME) | ||
36 | + { | ||
37 | + memcpy (buffer, NODE_NAME (token->val.node.spelling), | ||
38 | + NODE_LEN (token->val.node.spelling)); | ||
39 | + buffer += NODE_LEN (token->val.node.spelling); | ||
40 | + break; | ||
41 | + } | ||
42 | + /* NAMED_OP, cannot use node.spelling */ | ||
43 | + if (token->flags & NAMED_OP) | ||
44 | + { | ||
45 | + const char *str = cpp_named_operator2name (token->type); | ||
46 | + if (str) | ||
47 | + { | ||
48 | + size_t len = strlen(str); | ||
49 | + memcpy(buffer, str, len); | ||
50 | + buffer += len; | ||
51 | + } | ||
52 | + break; | ||
53 | + } | ||
54 | + } | ||
55 | else | ||
56 | buffer = _cpp_spell_ident_ucns (buffer, token->val.node.node); | ||
57 | break; | ||