SelfReview then cleanup, cleanup and cleanup again.

Author: hiddenalpha

src/main/cpp/_nix_based/jssc.cpp

@@ -532,31 +532,29 @@ JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setDTR
  */
 JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_writeBytes
   (JNIEnv *env, jobject, jlong portHandle, jbyteArray buffer){
-    if( buffer == NULL ){
+    ssize_t ret = 0;
+    jbyte *jBuffer = NULL;
+    if( !buffer ){
         jclass exClz = env->FindClass("java/lang/NullPointerException");
-        if( exClz != NULL ) env->ThrowNew(exClz, "buffer");
-        return 0;
+        if( exClz ) env->ThrowNew(exClz, "buffer");
+        goto Finally;
     }
-    jboolean ret = JNI_FALSE;
-    jbyte* jBuffer = env->GetByteArrayElements(buffer, JNI_FALSE);
-    if( jBuffer == NULL ){
-        jclass exClz = env->FindClass("java/lang/RuntimeException");
-        if( exClz != NULL ) env->ThrowNew(exClz, "jni->GetByteArrayElements() failed");
-        return 0;
+    jBuffer = env->GetByteArrayElements(buffer, NULL);
+    if( !jBuffer ){
+        jclass exClz = env->ExceptionCheck() ? NULL : env->FindClass("java/lang/RuntimeException");
+        if( exClz ) env->ThrowNew(exClz, "jni->GetByteArrayElements() failed");
+        goto Finally;
     }
-    jint bufferSize = env->GetArrayLength(buffer);
-    jint result = write(portHandle, jBuffer, (size_t)bufferSize);
-    if( result == -1 ){
-        int err = errno; /*bakup errno*/
+    ret = write(portHandle, jBuffer, env->GetArrayLength(buffer));
+    if( ret == -1 ){
+        int err = errno;
         jclass exClz = env->FindClass("java/io/IOException");
-        assert(exClz != NULL);
-        env->ThrowNew(exClz, strerror(err));
+        if( exClz ) env->ThrowNew(exClz, strerror(err));
         goto Finally;
     }
-    ret = (result == bufferSize) ? JNI_TRUE : JNI_FALSE;
 Finally:
-    env->ReleaseByteArrayElements(buffer, jBuffer, 0);
-    return ret;
+    if( jBuffer ) env->ReleaseByteArrayElements(buffer, jBuffer, 0);
+    return (jint)ret;
 }
 
 /**
@@ -677,7 +675,7 @@ JNIEXPORT jbyteArray JNICALL Java_jssc_SerialNativeInterface_readBytes
     lpBuffer = (jbyte*)malloc(byteCount*sizeof*lpBuffer);
     if( !lpBuffer ){
         char emsg[32]; emsg[0] = '\0';
-        snprintf(emsg, sizeof emsg, "malloc(%d) failed", byteCount*sizeof*lpBuffer);
+        snprintf(emsg, sizeof emsg, "malloc(%ld) failed", byteCount*sizeof*lpBuffer);
         jclass exClz = env->FindClass("java/lang/RuntimeException");
         if( exClz ) env->ThrowNew(exClz, emsg);
         returnArray = NULL; goto Finally;

src/main/cpp/jssc_SerialNativeInterface.h

@@ -245,13 +245,8 @@ JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_writeBytes
     }
     jbyte* jBuffer = env->GetByteArrayElements(buffer, NULL);
     if( !jBuffer ){
-        if( !env->ExceptionCheck() ){
-            /* IMHO this code should be unreachable, as GetByteArrayElements should already
-             * have set an exception by itself. But will keep it as old code had it and
-             * (who knows) maybe I miss something. So keep it to stay on the safe side. */
-            jclass exClz = env->FindClass("java/lang/RuntimeException");
-            if( exClz ) env->ThrowNew(exClz, "jni->GetByteArrayElements() failed");
-        }
+        jclass exClz = env->ExceptionCheck() ? NULL : env->FindClass("java/lang/RuntimeException");
+        if( exClz ) env->ThrowNew(exClz, "jni->GetByteArrayElements() failed");
         return 0;
     }
     OVERLAPPED *overlapped = new OVERLAPPED();
@@ -270,7 +265,9 @@ JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_writeBytes
     CloseHandle(overlapped->hEvent);
     delete overlapped;
     if( returnValue < 0 ){
-        return env->ThrowNew(env->FindClass("jssc/SerialPortException"), "WriteFile() failed");
+        jobject *exClz = env->FindClass("jssc/SerialPortException");
+        if( exClz ) env->ThrowNew(exClz, "WriteFile() failed");
+        return 0;
     }
     return returnValue;
 }