Mercurial > hg > release > thermostat-1.0

changeset 1378:9ecfae760078

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix warnings in keyring review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-November/008962.html reviewed-by: jerboaa
author Mario Torre <neugens.limasoftware@gmail.com>
date Mon, 02 Dec 2013 14:04:06 +0100
parents 31528d30c099
children b9dc33ef549a
files keyring/src/main/native/GnomeKeyringLibraryNative.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/keyring/src/main/native/GnomeKeyringLibraryNative.c	Tue Nov 26 01:21:08 2013 -0700
+++ b/keyring/src/main/native/GnomeKeyringLibraryNative.c	Mon Dec 02 14:04:06 2013 +0100
@@ -73,7 +73,7 @@
     }
 
     jsize passwordLength = (*env)->GetArrayLength(env, jpassword);
-    char *password = (*env)->GetByteArrayElements(env, jpassword, NULL);
+    jbyte *password = (*env)->GetByteArrayElements(env, jpassword, NULL);
     if (password == NULL) {
         (*env)->ReleaseStringUTFChars(env, jurl, url);
         (*env)->ReleaseStringUTFChars(env, juserName, userName);
@@ -162,9 +162,11 @@
     (*env)->ReleaseStringUTFChars(env, juserName, userName);
 
     if (res == GNOME_KEYRING_RESULT_OK) {
+        const jbyte *jbytePassword = (const jbyte *) password;
+
         jsize passwordLength = strlen(password);
         jbyteArray jpassword = (*env)->NewByteArray(env, passwordLength);
-        (*env)->SetByteArrayRegion(env, jpassword, 0, passwordLength, password);
+        (*env)->SetByteArrayRegion(env, jpassword, 0, passwordLength, jbytePassword);
         gnome_keyring_free_password(password);
         return jpassword;
     } else {