infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-03 19:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

8044342: build failure on Windows noticed with recent smartcardio fix

Browse Source 
Reviewed-by: valeriep
This commit is contained in:
Ivan Gerasimov 2014-05-30 02:33:20 +04:00
parent 1eef4367df
commit e85046645b
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jdk/src/share/native/sun/security/smartcardio/pcsc.c
View File

@ -122,28 +122,35 @@ JNIEXPORT jlong JNICALL Java_sun_security_smartcardio_PCSC_SCardEstablishContext
/**
* Convert a multi string to a java string array,
*/
jobjectArray pcsc_multi2jstring(JNIEnv *env, char *spec, DWORD size) {
jobjectArray pcsc_multi2jstring(JNIEnv *env, char *spec) {
jobjectArray result;
jclass stringClass;
char* tab[PCSCLITE_MAX_READERS_CONTEXTS];
char *cp, **tab = NULL;
jstring js;
int cnt = 0;
DWORD i;
if (spec && size) {
spec[size - 1] = 0;
for (i = 0; i < size && spec[i]; ++i) {
tab[cnt++] = spec + i;
if (cnt == PCSCLITE_MAX_READERS_CONTEXTS) {
break;
}
for (++i; i < size && spec[i]; ++i) {
}
}
cp = spec;
while (*cp != 0) {
cp += (strlen(cp) + 1);
++cnt;
}
tab = (char **)malloc(cnt * sizeof(char *));
if (tab == NULL) {
throwOutOfMemoryError(env, NULL);
return NULL;
}
cnt = 0;
cp = spec;
while (*cp != 0) {
tab[cnt++] = cp;
cp += (strlen(cp) + 1);
}
stringClass = (*env)->FindClass(env, "java/lang/String");
if (stringClass == NULL) {
free(tab);
return NULL;
}
@ -152,15 +159,18 @@ jobjectArray pcsc_multi2jstring(JNIEnv *env, char *spec, DWORD size) {
while (cnt-- > 0) {
js = (*env)->NewStringUTF(env, tab[cnt]);
if ((*env)->ExceptionCheck(env)) {
free(tab);
return NULL;
}
(*env)->SetObjectArrayElement(env, result, cnt, js);
if ((*env)->ExceptionCheck(env)) {
free(tab);
return NULL;
}
(*env)->DeleteLocalRef(env, js);
}
}
free(tab);
return result;
}
@ -195,7 +205,7 @@ JNIEXPORT jobjectArray JNICALL Java_sun_security_smartcardio_PCSC_SCardListReade
dprintf1("-String: %s\n", mszReaders);
}
result = pcsc_multi2jstring(env, mszReaders, size);
result = pcsc_multi2jstring(env, mszReaders);
free(mszReaders);
return result;
}