michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: NULL check in getString 

fix: wrong object being used when retrieving fields
This commit is contained in:
Brian Matzon 2002-08-26 22:16:25 +00:00
parent 21b1ea9862
commit 1ea4bf10b4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/native/win32/org_lwjgl_openal_ALC.cpp
View File

@ -53,9 +53,14 @@
JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_ALC_getString (JNIEnv *env, jobject obj, jobject device, jint token) {
jclass class_device = env->GetObjectClass(device);
jfieldID field_device = env->GetFieldID(class_device, "device", "I");
jint deviceaddress = env->GetIntField(obj, field_device);
jint deviceaddress = env->GetIntField(device, field_device);
jstring string = env->NewStringUTF((const char*) alcGetString((ALCdevice*) deviceaddress, (ALenum) token));
const char* alcString = (const char*) alcGetString((ALCdevice*) deviceaddress, (ALenum) token);
if(alcString == NULL) {
return NULL;
}
jstring string = env->NewStringUTF(alcString);
CHECK_ALC_ERROR
return string;
@ -70,7 +75,7 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_ALC_getString (JNIEnv *env, jobj
JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_getIntegerv (JNIEnv *env, jobject obj, jobject device, jint token, jint size, jint dest) {
jclass device_class = env->GetObjectClass(device);
jfieldID device_field = env->GetFieldID(device_class, "device", "I");
jint deviceaddress = env->GetIntField(obj, device_field);
jint deviceaddress = env->GetIntField(device, device_field);
alcGetIntegerv((ALCdevice*) deviceaddress, (ALenum) token, (ALsizei) size, (ALint*) dest);
CHECK_ALC_ERROR