diff options
Diffstat (limited to 'meta/recipes-devtools/nasm/nasm/0001-preproc-parse_size-Check-for-string-provided.patch')
| -rw-r--r-- | meta/recipes-devtools/nasm/nasm/0001-preproc-parse_size-Check-for-string-provided.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-devtools/nasm/nasm/0001-preproc-parse_size-Check-for-string-provided.patch b/meta/recipes-devtools/nasm/nasm/0001-preproc-parse_size-Check-for-string-provided.patch deleted file mode 100644 index 2121fd17f3..0000000000 --- a/meta/recipes-devtools/nasm/nasm/0001-preproc-parse_size-Check-for-string-provided.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a2f43331a853b7cc449cae3361ee1fb54c7fad8d Mon Sep 17 00:00:00 2001 -From: Cyrill Gorcunov <gorcunov@gmail.com> -Date: Sat, 29 Sep 2018 14:30:14 +0300 -Subject: [PATCH] preproc: parse_size -- Check for string provided - -In case if the string is nil we will have sigsegv. - -https://bugzilla.nasm.us/show_bug.cgi?id=3392507 - -Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> - -CVE: CVE-2018-1000667 -Upstream-Status: Backport -https://repo.or.cz/nasm/nasm.git/commit/c713b5f994cf7b29164c3b6838b91f0499591434 - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - asm/preproc.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/asm/preproc.c b/asm/preproc.c -index 475926d..1d770a5 100644 ---- a/asm/preproc.c -+++ b/asm/preproc.c -@@ -2216,8 +2216,7 @@ static int parse_size(const char *str) { - { "byte", "dword", "oword", "qword", "tword", "word", "yword" }; - static const int sizes[] = - { 0, 1, 4, 16, 8, 10, 2, 32 }; -- -- return sizes[bsii(str, size_names, ARRAY_SIZE(size_names))+1]; -+ return str ? sizes[bsii(str, size_names, ARRAY_SIZE(size_names))+1] : 0; - } - - /* --- -2.8.1 - |