diff options
| author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2020-12-14 15:54:59 +0800 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2021-01-10 19:24:24 -0800 |
| commit | aaaf03ada11b7f0207c34bc5f72ffff942fee8b6 (patch) | |
| tree | 3c044815d31067fc2d7182cbc02908b8bc91bdf1 /meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch | |
| parent | c70dcb9bd1fb47b0b09afdc812cbd3aa3ad14bc9 (diff) | |
| download | meta-openembedded-aaaf03ada11b7f0207c34bc5f72ffff942fee8b6.tar.gz | |
mcpp: Normalize the patch format of CVE
Because CVE-2019-14274.patch is included in ice-mcpp.patch, the cve-check-tool fails to correctly judge the CVE of the OSS. CVE-2019-14274.patch is separated from ice-mcpp.patch to fix the problem.
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 9301b77e3266160ffb7e9bfd69d445f0392076c8)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
(cherry picked from commit 81874b239287126805aa176907bd52e9a7801655)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch b/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch index 8103cf0920..1df3ae55bc 100644 --- a/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch +++ b/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch | |||
| @@ -114,37 +114,6 @@ diff -r -c -N ../mcpp-2.7.2-old/src/main.c ./src/main.c | |||
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | int mcpp_lib_main | 116 | int mcpp_lib_main |
| 117 | diff -r -c -N ../mcpp-2.7.2-old/src/support.c ./src/support.c | ||
| 118 | *** ../mcpp-2.7.2-old/src/support.c Tue Jun 10 06:02:33 2008 | ||
| 119 | --- ./src/support.c Fri May 14 12:40:56 2010 | ||
| 120 | *************** | ||
| 121 | *** 188,194 **** | ||
| 122 | size_t length | ||
| 123 | ) | ||
| 124 | { | ||
| 125 | ! if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */ | ||
| 126 | size_t size = MAX( BUF_INCR_SIZE, length); | ||
| 127 | |||
| 128 | if (mem_buf_p->buffer == NULL) { /* 1st append */ | ||
| 129 | --- 188,194 ---- | ||
| 130 | size_t length | ||
| 131 | ) | ||
| 132 | { | ||
| 133 | ! if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */ | ||
| 134 | size_t size = MAX( BUF_INCR_SIZE, length); | ||
| 135 | |||
| 136 | if (mem_buf_p->buffer == NULL) { /* 1st append */ | ||
| 137 | *************** | ||
| 138 | *** 1722,1727 **** | ||
| 139 | --- 1722,1729 ---- | ||
| 140 | sp -= 2; | ||
| 141 | while (*sp != '\n') /* Until end of line */ | ||
| 142 | mcpp_fputc( *sp++, OUT); | ||
| 143 | + mcpp_fputc( '\n', OUT); | ||
| 144 | + wrong_line = TRUE; | ||
| 145 | } | ||
| 146 | goto end_line; | ||
| 147 | default: /* Not a comment */ | ||
| 148 | diff -r -c -N ../mcpp-2.7.2-old/src/system.c ./src/system.c | 117 | diff -r -c -N ../mcpp-2.7.2-old/src/system.c ./src/system.c |
| 149 | *** ../mcpp-2.7.2-old/src/system.c 2008-11-26 10:53:51.000000000 +0100 | 118 | *** ../mcpp-2.7.2-old/src/system.c 2008-11-26 10:53:51.000000000 +0100 |
| 150 | --- ./src/system.c 2011-02-21 16:18:05.678058106 +0100 | 119 | --- ./src/system.c 2011-02-21 16:18:05.678058106 +0100 |
