RH2021263: Return in C code after having generated Java exception

fridrich · gnu-andrew · commit 4f9c891761e9 · 2022-03-16T17:23:25.000Z
diff --git a/src/java.base/linux/native/libsystemconf/systemconf.c b/src/java.base/linux/native/libsystemconf/systemconf.c
@@ -131,11 +131,13 @@ JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEn
     dbgPrint(env, "getSystemFIPSEnabled: reading " FIPS_ENABLED_PATH);
     if ((fe = fopen(FIPS_ENABLED_PATH, "r")) == NULL) {
         throwIOException(env, "Cannot open " FIPS_ENABLED_PATH);
+        return JNI_FALSE;
     }
     fips_enabled = fgetc(fe);
     fclose(fe);
     if (fips_enabled == EOF) {
         throwIOException(env, "Cannot read " FIPS_ENABLED_PATH);
+        return JNI_FALSE;
     }
     msg_bytes = snprintf(msg, MSG_MAX_SIZE, "getSystemFIPSEnabled:" \
             " read character is '%c'", fips_enabled);

Original file line number	Diff line number	Diff line change
`@@ -131,11 +131,13 @@ JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEn`
`131`	`131`	`dbgPrint(env, "getSystemFIPSEnabled: reading " FIPS_ENABLED_PATH);`
`132`	`132`	`if ((fe = fopen(FIPS_ENABLED_PATH, "r")) == NULL) {`
`133`	`133`	`throwIOException(env, "Cannot open " FIPS_ENABLED_PATH);`
	`134`	`+ return JNI_FALSE;`
`134`	`135`	`}`
`135`	`136`	`fips_enabled = fgetc(fe);`
`136`	`137`	`fclose(fe);`
`137`	`138`	`if (fips_enabled == EOF) {`
`138`	`139`	`throwIOException(env, "Cannot read " FIPS_ENABLED_PATH);`
	`140`	`+ return JNI_FALSE;`
`139`	`141`	`}`
`140`	`142`	`msg_bytes = snprintf(msg, MSG_MAX_SIZE, "getSystemFIPSEnabled:" \`
`141`	`143`	`" read character is '%c'", fips_enabled);`