summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/0001-jdk-comparison-between-pointer-and-integer.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0001-jdk-comparison-between-pointer-and-integer.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0001-jdk-comparison-between-pointer-and-integer.patch144
1 files changed, 0 insertions, 144 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-jdk-comparison-between-pointer-and-integer.patch b/recipes-core/openjdk/patches-openjdk-8/0001-jdk-comparison-between-pointer-and-integer.patch
deleted file mode 100644
index b310598..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/0001-jdk-comparison-between-pointer-and-integer.patch
+++ /dev/null
@@ -1,144 +0,0 @@
1From 97d6911fb581f9e44785db29abbf97ce77713f50 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Fri, 2 Mar 2018 11:13:08 +0000
4Subject: [PATCH 1/9] jdk: comparison between pointer and integer
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9In file included from jdk/src/share/native/java/net/net_util.c:28:0:
10jdk/src/share/native/java/net/net_util.c: In function 'NET_SockaddrToInetAddress':
11jdk/src/share/native/common/jni_util.h:302:17: warning: comparison between pointer and integer
12 if ((x) == NULL) { \
13 ^
14jdk/src/share/native/java/net/net_util.c:225:13: note: in expansion of macro 'CHECK_NULL_RETURN'
15 CHECK_NULL_RETURN(ret, NULL);
16 ^~~~~~~~~~~~~~~~~
17
18Backport a patch to fix this.
19
20Upstream-Status: Backport [http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/90c643593ed7]
21Signed-off-by: André Draszik <andre.draszik@jci.com>
22---
23 jdk/src/share/native/java/net/net_util.c | 15 +++++++--------
24 jdk/src/share/native/java/net/net_util.h | 8 ++++----
25 jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 4 ++--
26 3 files changed, 13 insertions(+), 14 deletions(-)
27
28diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c
29index 2194e2e6..00c9e2ac 100644
30--- a/jdk/src/share/native/java/net/net_util.c
31+++ b/jdk/src/share/native/java/net/net_util.c
32@@ -108,7 +108,7 @@ jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) {
33 return (*env)->GetObjectField(env, holder, ia6_scopeifnameID);
34 }
35
36-int setInet6Address_scopeifname(JNIEnv *env, jobject iaObj, jobject scopeifname) {
37+jboolean setInet6Address_scopeifname(JNIEnv *env, jobject iaObj, jobject scopeifname) {
38 jobject holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
39 CHECK_NULL_RETURN(holder, JNI_FALSE);
40 (*env)->SetObjectField(env, holder, ia6_scopeifnameID, scopeifname);
41@@ -127,7 +127,7 @@ int getInet6Address_scopeid(JNIEnv *env, jobject iaObj) {
42 return (*env)->GetIntField(env, holder, ia6_scopeidID);
43 }
44
45-int setInet6Address_scopeid(JNIEnv *env, jobject iaObj, int scopeid) {
46+jboolean setInet6Address_scopeid(JNIEnv *env, jobject iaObj, int scopeid) {
47 jobject holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
48 CHECK_NULL_RETURN(holder, JNI_FALSE);
49 (*env)->SetIntField(env, holder, ia6_scopeidID, scopeid);
50@@ -138,7 +138,7 @@ int setInet6Address_scopeid(JNIEnv *env, jobject iaObj, int scopeid) {
51 }
52
53
54-int getInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *dest) {
55+jboolean getInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *dest) {
56 jobject holder, addr;
57 jbyteArray barr;
58
59@@ -150,7 +150,7 @@ int getInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *dest) {
60 return JNI_TRUE;
61 }
62
63-int setInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *address) {
64+jboolean setInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *address) {
65 jobject holder;
66 jbyteArray addr;
67
68@@ -202,7 +202,6 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) {
69 jobject iaObj;
70 #ifdef AF_INET6
71 if (him->sa_family == AF_INET6) {
72- jbyteArray ipaddress;
73 #ifdef WIN32
74 struct SOCKADDR_IN6 *him6 = (struct SOCKADDR_IN6 *)him;
75 #else
76@@ -218,11 +217,12 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) {
77 setInetAddress_family(env, iaObj, IPv4);
78 } else {
79 jint scope;
80- int ret;
81+ jboolean ret;
82 iaObj = (*env)->NewObject(env, ia6_class, ia6_ctrID);
83 CHECK_NULL_RETURN(iaObj, NULL);
84 ret = setInet6Address_ipaddress(env, iaObj, (char *)&(him6->sin6_addr));
85- CHECK_NULL_RETURN(ret, NULL);
86+ if (ret == JNI_FALSE)
87+ return NULL;
88 setInetAddress_family(env, iaObj, IPv6);
89 scope = getScopeID(him);
90 setInet6Address_scopeid(env, iaObj, scope);
91@@ -269,7 +269,6 @@ NET_SockaddrEqualsInetAddress(JNIEnv *env, struct sockaddr *him, jobject iaObj)
92 return JNI_FALSE;
93 }
94 } else {
95- jbyteArray ipaddress;
96 jbyte caddrCur[16];
97 int scope;
98
99diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h
100index c8a5e68c..176ca586 100644
101--- a/jdk/src/share/native/java/net/net_util.h
102+++ b/jdk/src/share/native/java/net/net_util.h
103@@ -64,12 +64,12 @@ JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env);
104 * get_ methods that return objects return NULL on error.
105 */
106 extern jobject getInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj);
107-extern int setInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj, jobject scopeifname);
108+extern jboolean setInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj, jobject scopeifname);
109 extern int getInet6Address_scopeid_set(JNIEnv *env, jobject ia6Obj);
110 extern int getInet6Address_scopeid(JNIEnv *env, jobject ia6Obj);
111-extern int setInet6Address_scopeid(JNIEnv *env, jobject ia6Obj, int scopeid);
112-extern int getInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *dest);
113-extern int setInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *address);
114+extern jboolean setInet6Address_scopeid(JNIEnv *env, jobject ia6Obj, int scopeid);
115+extern jboolean getInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *dest);
116+extern jboolean setInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *address);
117
118 extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address);
119 extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family);
120diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c
121index e29a25da..23ec2985 100644
122--- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c
123+++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c
124@@ -403,7 +403,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
125 }
126
127 while (iterator != NULL) {
128- int ret1;
129+ jboolean ret1;
130 if (iterator->ai_family == AF_INET) {
131 jobject iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID);
132 if (IS_NULL(iaObj)) {
133@@ -423,7 +423,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
134 goto cleanupAndReturn;
135 }
136 ret1 = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
137- if (!ret1) {
138+ if (ret1 == JNI_FALSE) {
139 ret = NULL;
140 goto cleanupAndReturn;
141 }
142--
1432.16.2
144
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-13 15:43:55 +0000