summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
index ad480e3..69b85aa 100644
--- a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
@@ -1,7 +1,7 @@
1From 3a6eef99b27b7dd750e7a02eb3ada71db99d9345 Mon Sep 17 00:00:00 2001 1From 1beb42da8445e9ca6c8560f8c78cac185fffb64d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Fri, 10 Aug 2018 14:54:45 +0100 3Date: Fri, 10 Aug 2018 14:54:45 +0100
4Subject: [PATCH 1004/1012] hotspot: backport patch to fix misuses of 4Subject: [PATCH 1004/1013] hotspot: backport patch to fix misuses of
5 strncpy/strncat 5 strncpy/strncat
6MIME-Version: 1.0 6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
@@ -84,10 +84,10 @@ index 93cd9e854..e7b32cd6b 100644
84 } 84 }
85 } else if (match(event, "format bytes-per-line")) { 85 } else if (match(event, "format bytes-per-line")) {
86diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp 86diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
87index 2665b6b8c..5a9294677 100644 87index 7c85a0da8..ea4026b98 100644
88--- a/hotspot/src/share/vm/runtime/arguments.cpp 88--- a/hotspot/src/share/vm/runtime/arguments.cpp
89+++ b/hotspot/src/share/vm/runtime/arguments.cpp 89+++ b/hotspot/src/share/vm/runtime/arguments.cpp
90@@ -3455,7 +3455,7 @@ void Arguments::fix_appclasspath() { 90@@ -3456,7 +3456,7 @@ void Arguments::fix_appclasspath() {
91 } 91 }
92 92
93 char* copy = AllocateHeap(strlen(src) + 1, mtInternal); 93 char* copy = AllocateHeap(strlen(src) + 1, mtInternal);
@@ -96,7 +96,7 @@ index 2665b6b8c..5a9294677 100644
96 96
97 // trim all trailing empty paths 97 // trim all trailing empty paths
98 for (char* tail = copy + strlen(copy) - 1; tail >= copy && *tail == separator; tail--) { 98 for (char* tail = copy + strlen(copy) - 1; tail >= copy && *tail == separator; tail--) {
99@@ -3834,17 +3834,16 @@ static char* get_shared_archive_path() { 99@@ -3835,17 +3835,16 @@ static char* get_shared_archive_path() {
100 if (end != NULL) *end = '\0'; 100 if (end != NULL) *end = '\0';
101 size_t jvm_path_len = strlen(jvm_path); 101 size_t jvm_path_len = strlen(jvm_path);
102 size_t file_sep_len = strlen(os::file_separator()); 102 size_t file_sep_len = strlen(os::file_separator());
@@ -148,7 +148,7 @@ index 1b00f829a..4daea2b7e 100644
148 // Note that the following does not depend on write_len. 148 // Note that the following does not depend on write_len.
149 // This means that position and count get updated 149 // This means that position and count get updated
150diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp 150diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp
151index ef3bb5cee..c11fef472 100644 151index 49b978a02..97c5e33f2 100644
152--- a/hotspot/src/share/vm/utilities/vmError.cpp 152--- a/hotspot/src/share/vm/utilities/vmError.cpp
153+++ b/hotspot/src/share/vm/utilities/vmError.cpp 153+++ b/hotspot/src/share/vm/utilities/vmError.cpp
154@@ -450,14 +450,7 @@ void VMError::report(outputStream* st) { 154@@ -450,14 +450,7 @@ void VMError::report(outputStream* st) {
@@ -168,5 +168,5 @@ index ef3bb5cee..c11fef472 100644
168 st->print(" (0x%x)", _id); 168 st->print(" (0x%x)", _id);
169 } 169 }
170-- 170--
1712.24.1 1712.26.2
172 172